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

bugfix

Browse Source
This commit is contained in:
ailanyin
2023-07-21 16:43:36 +08:00
parent 3d9c6bbb28
commit 6a14f15880
13 changed files with 1583 additions and 1297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/api/admin/laboratory/achievement.js
View File

@ -1,6 +1,6 @@
import request from "@/utils/request";
// 实验室专利成果
// 专家成果
export const achievementList = (params) => {
return request({
url: `/app/laboratory/achievementList`,
@ -9,9 +9,20 @@ export const achievementList = (params) => {
});
};
// 实验室成果
export const laboratoryAchievementList = (params) => {
return request({
url: `/app/laboratory/laboratoryAchievementList`,
method: "GET",
params,
});
}
export const deleteAchievements = (ids) => {
return request({
url: `/app/laboratory/deleteAchievements/${ids}`,
method: "DELETE",
});
};

2
src/api/admin/laboratory/expert.js
View File

@ -40,7 +40,7 @@ export const deleteLabPatentByIds = (ids) => {
/**
* 实验室专利列表
* 实验室未绑定专家列表
* @param params
* @return {*}
*/

9
src/api/admin/research/achievement.js
View File

@ -9,6 +9,15 @@ export const achievementList = (params) => {
});
};
// 科研成果
export const researchAchievementList = (params) => {
return request({
url: `/app/research/researchAchievementList`,
method: "GET",
params,
});
}
export const deleteAchievements = (ids) => {
return request({
url: `/app/research/deleteAchievements/${ids}`,

22
src/assets/achievement_import_description.txt Normal file
View File

@ -0,0 +1,22 @@
1. ʡ<><CAA1><EFBFBD><EFBFBD><EFBFBD>ͺ<EFBFBD>̨<EFBFBD><CCA8>Ӧ(<28><><EFBFBD><EFBFBD>: <20><><EFBFBD><EFBFBD>,<2C><><EFBFBD><EFBFBD>д<EFBFBD>ɰ<EFBFBD><C9B0><EFBFBD>ʡ, <20>Ϸ<EFBFBD><CFB7>в<EFBFBD><D0B2><EFBFBD>д<EFBFBD>ɺϷ<C9BA>)
2. <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
a. ͨ<><CDA8> > <20><><EFBFBD><EFBFBD>
<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ҽҩ><3E><>ҩ<EFBFBD><D2A9><EFBFBD><EFBFBD>Ȼҩ<C8BB><D2A9>><3E><><EFBFBD><EFBFBD>ҩ<EFBFBD><D2A9><EFBFBD>з<EFBFBD><D0B7><EFBFBD><EFBFBD><EFBFBD>
b. <20><><EFBFBD><EFBFBD>ͨ<EFBFBD><CDA8> / <20><><EFBFBD><EFBFBD>
<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ҽҩ><3E><>ҩ<EFBFBD><D2A9><EFBFBD><EFBFBD>Ȼҩ<C8BB><D2A9>><3E><><EFBFBD><EFBFBD>ҩ<EFBFBD><D2A9><EFBFBD>з<EFBFBD><D0B7><EFBFBD><EFBFBD><EFBFBD>/<2F>߼<EFBFBD><DFBC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>>֪ʶ<D6AA><CAB6>Ȩ<EFBFBD><C8A8><EFBFBD>ɹ<EFBFBD>ת<EFBFBD><D7AA><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
3. Ӧ<>ÿͻ<C3BF>
<09><><EFBFBD><EFBFBD>ͨ<EFBFBD><CDA8> , (Ӣ<>Ķ<EFBFBD><C4B6><EFBFBD>) <20><><EFBFBD><EFBFBD>
4. <20>ؼ<EFBFBD><D8BC><EFBFBD>
<09><><EFBFBD><EFBFBD>ͨ<EFBFBD><CDA8> , (Ӣ<>Ķ<EFBFBD><C4B6><EFBFBD>) <20><><EFBFBD><EFBFBD>
5. <20>ɹ<EFBFBD><C9B9><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:
<09><><EFBFBD><EFBFBD><EFBFBD>з<EFBFBD> С<>Խ׶<D4BD> ͨ<><CDA8>С<EFBFBD><D0A1> <20><><EFBFBD>Խ׶<D4BD> ͨ<><CDA8><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>ɹ<EFBFBD>ģ<EFBFBD><C4A3><EFBFBD><EFBFBD>
6. <20>ɹ<EFBFBD><C9B9><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:
<09><><EFBFBD><EFBFBD><EFBFBD>Ƚ<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>Ƚ<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
7. <20><><EFBFBD><EFBFBD>ģʽ:
<09><><EFBFBD><EFBFBD>ת<EFBFBD><D7AA> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><>˾ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>г<EFBFBD><D0B3>ƹ<EFBFBD> <20><><EFBFBD><EFBFBD>

BIN
src/assets/achievement_import_template.xlsx Normal file
View File

Binary file not shown.

19
src/components/ImageUpload/index.vue
View File

@ -18,7 +18,7 @@
name="file"
>
<el-icon class="avatar-uploader-icon">
<plus />
<plus/>
</el-icon>
</el-upload>
<!-- 上传提示 -->
@ -48,7 +48,7 @@
</template>
<script setup>
import { getToken } from "@/utils/auth";
import {getToken} from "@/utils/auth";
const props = defineProps({
modelValue: [String, Object, Array],
@ -74,7 +74,7 @@ const props = defineProps({
},
});
const { proxy } = getCurrentInstance();
const {proxy} = getCurrentInstance();
const emit = defineEmits();
const number = ref(0);
const uploadList = ref([]);
@ -82,7 +82,7 @@ const dialogImageUrl = ref("");
const dialogVisible = ref(false);
const baseUrl = import.meta.env.VITE_APP_BASE_API;
const uploadImgUrl = ref(import.meta.env.VITE_APP_BASE_API + "/common/upload"); // 上传的图片服务器地址
const headers = ref({ "client-token": "Bearer " + getToken() });
const headers = ref({"client-token": "Bearer " + getToken()});
const fileList = ref([]);
const showTip = computed(
() => props.isShowTip && (props.fileType || props.fileSize)
@ -98,9 +98,10 @@ watch(
fileList.value = list.map((item) => {
if (typeof item === "string") {
if (item.indexOf(baseUrl) === -1) {
item = { name: baseUrl + item, url: baseUrl + item };
// item = {name: baseUrl + item, url: baseUrl + item};
item = {name: item, url: `${baseUrl}/file${item}`};
} else {
item = { name: item, url: item };
item = {name: item, url: item};
}
}
return item;
@ -110,7 +111,7 @@ watch(
return [];
}
},
{ deep: true, immediate: true }
{deep: true, immediate: true}
);
// 删除图片
@ -120,7 +121,7 @@ function handleRemove(file, files) {
// 上传成功回调
function handleUploadSuccess(res) {
uploadList.value.push({ name: res.fileName, url: res.url });
uploadList.value.push({name: res.fileName, url: `${baseUrl}/file${res.fileName}`});
if (uploadList.value.length === number.value) {
fileList.value = fileList.value
.filter((f) => f.url !== undefined)
@ -189,7 +190,7 @@ function listToString(list, separator) {
for (let i in list) {
if (undefined !== list[i].url && list[i].url.indexOf("blob:") !== 0) {
// strs += list[i].url.replace(baseUrl, "") + separator;
strs += list[i].url + separator;
strs += list[i].name + separator;
}
}
return strs != "" ? strs.substr(0, strs.length - 1) : "";

219
src/router/index.js
View File

@ -1,4 +1,4 @@
import { createRouter, createWebHistory } from "vue-router";
import {createRouter, createWebHistory} from "vue-router";
/* Layout */
import Layout from "@/layout";
import basicInfo from "../views/admin/enterprise/account/basicInfo.vue";
@ -240,37 +240,37 @@ export const constantRoutes = [
path: "index",
component: () => import("@/views/identity/index"),
name: "index",
meta: { title: "身份选择" },
meta: {title: "身份选择"},
},
{
path: "enterprise",
component: () => import("@/views/identity/enterprise"),
name: "enterprise",
meta: { title: "企业入驻" },
meta: {title: "企业入驻"},
},
{
path: "expert",
component: () => import("@/views/identity/expert"),
name: "expert",
meta: { title: "专家入驻" },
meta: {title: "专家入驻"},
},
{
path: "research",
component: () => import("@/views/identity/research"),
name: "research",
meta: { title: "研究机构入驻" },
meta: {title: "研究机构入驻"},
},
{
path: "laboratory",
component: () => import("@/views/identity/laboratory"),
name: "laboratory",
meta: { title: "实验室入驻" },
meta: {title: "实验室入驻"},
},
{
path: "agent",
component: () => import("@/views/identity/agent"),
name: "agent",
meta: { title: "科技经纪人入驻" },
meta: {title: "科技经纪人入驻"},
},
],
}, //TODO:
@ -298,7 +298,7 @@ export const constantRoutes = [
path: "profile",
component: () => import("@/views/system/user/profile/index"),
name: "Profile",
meta: { title: "个人中心", icon: "user" },
meta: {title: "个人中心", icon: "user"},
},
],
},
@ -315,14 +315,14 @@ export const enterpriseRoutes = [
path: "index",
component: () => import("@/views/admin/enterprise/index"),
name: "Index",
meta: { title: "首页", icon: "dashboard", affix: true },
meta: {title: "首页", icon: "dashboard", affix: true},
},
],
},
{
path: "/account",
component: Layout,
meta: { title: "账号管理", icon: "dashboard" },
meta: {title: "账号管理", icon: "dashboard"},
alwaysShow: true,
redirect: "/account/basicInfo",
children: [
@ -330,20 +330,20 @@ export const enterpriseRoutes = [
path: "basicInfo",
component: basicInfo,
name: "basicInfo",
meta: { title: "基本资料", icon: "list" },
meta: {title: "基本资料", icon: "list"},
},
{
path: "joinMembership",
component: () =>
import("@/views/admin/enterprise/account/joinMembership"),
name: "joinMembership",
meta: { title: "开通会员", icon: "list" },
meta: {title: "开通会员", icon: "list"},
},
{
path: "bill",
component: () => import("@/views/admin/enterprise/account/bill"),
name: "Bill",
meta: { title: "账单列表", icon: "list" },
meta: {title: "账单列表", icon: "list"},
}, // {
// path: "record",
// component: () => import("@/views/admin/enterprise/account/record"),
@ -355,7 +355,7 @@ export const enterpriseRoutes = [
{
path: "/extension",
component: Layout,
meta: { title: "产品推广", icon: "dashboard" },
meta: {title: "产品推广", icon: "dashboard"},
alwaysShow: true,
redirect: "/extension/product",
children: [
@ -363,35 +363,35 @@ export const enterpriseRoutes = [
path: "product",
component: () => import("@/views/admin/enterprise/extension/product"),
name: "Product",
meta: { title: "产品列表", icon: "list" },
meta: {title: "产品列表", icon: "list"},
},
{
path: "release",
component: () => import("@/views/admin/enterprise/extension/release"),
hidden: true,
name: "Release",
meta: { title: "发布产品", icon: "list" },
meta: {title: "发布产品", icon: "list"},
},
{
path: "results",
component: () => import("@/views/admin/enterprise/extension/results"),
hidden: true,
name: "Results",
meta: { title: "匹配结果", icon: "list", isMatch: true },
meta: {title: "匹配结果", icon: "list", isMatch: true},
},
{
path: "business",
component: () => import("@/views/admin/enterprise/extension/business"),
hidden: true,
name: "Business",
meta: { title: "浏览信息", icon: "list" },
meta: {title: "浏览信息", icon: "list"},
},
],
},
{
path: "/demand",
component: Layout,
meta: { title: "需求管理", icon: "dashboard" },
meta: {title: "需求管理", icon: "dashboard"},
alwaysShow: true,
redirect: "/demand/serviceDemand",
children: [
@ -400,7 +400,7 @@ export const enterpriseRoutes = [
component: () =>
import("@/views/admin/enterprise/demand/serviceDemand"),
name: "serviceDemand",
meta: { title: "服务需求", icon: "list" },
meta: {title: "服务需求", icon: "list"},
},
{
path: "releaseService",
@ -408,13 +408,13 @@ export const enterpriseRoutes = [
import("@/views/admin/enterprise/demand/releaseService"),
hidden: true,
name: "releaseService",
meta: { title: "发布服务需求", icon: "list" },
meta: {title: "发布服务需求", icon: "list"},
},
{
path: "technology",
component: () => import("@/views/admin/enterprise/demand/technology"),
name: "technology",
meta: { title: "技术需求", icon: "list" },
meta: {title: "技术需求", icon: "list"},
},
{
path: "releaseTechnology",
@ -422,21 +422,21 @@ export const enterpriseRoutes = [
import("@/views/admin/enterprise/demand/releaseTechnology"),
hidden: true,
name: "releaseTechnology",
meta: { title: "发布技术需求", icon: "list" },
meta: {title: "发布技术需求", icon: "list"},
},
{
path: "results",
component: () => import("@/views/admin/enterprise/extension/results"),
hidden: true,
name: "results",
meta: { title: "匹配结果", icon: "list", isMatch: true },
meta: {title: "匹配结果", icon: "list", isMatch: true},
},
],
},
{
path: "/activity",
component: Layout,
meta: { title: "活动管理", icon: "dashboard" },
meta: {title: "活动管理", icon: "dashboard"},
alwaysShow: true,
redirect: "/activity/active",
children: [
@ -444,7 +444,7 @@ export const enterpriseRoutes = [
path: "active",
component: () => import("@/views/admin/enterprise/activity/active"),
name: "Active",
meta: { title: "活动列表", icon: "list" },
meta: {title: "活动列表", icon: "list"},
},
],
},
@ -461,14 +461,14 @@ export const expertRoutes = [
path: "index",
component: () => import("@/views/admin/expert/index"),
name: "Index",
meta: { title: "首页", icon: "dashboard", affix: true },
meta: {title: "首页", icon: "dashboard", affix: true},
},
],
},
{
path: "/account",
component: Layout,
meta: { title: "账号管理", icon: "dashboard" },
meta: {title: "账号管理", icon: "dashboard"},
alwaysShow: true, // redirect: 'noRedirect',
redirect: "/account/bill",
children: [
@ -488,7 +488,7 @@ export const expertRoutes = [
path: "basicInfo",
component: () => import("@/views/admin/expert/account/basicInfo"),
name: "basicInfo",
meta: { title: "基本资料", icon: "list" },
meta: {title: "基本资料", icon: "list"},
}, // {
// path: "transactionAuth",
// component: () => import("@/views/admin/expert/account/transactionAuth"),
@ -513,7 +513,7 @@ export const expertRoutes = [
{
path: "/technology",
component: Layout,
meta: { title: "技术管理", icon: "dashboard" },
meta: {title: "技术管理", icon: "dashboard"},
alwaysShow: true,
redirect: "/technology/achievement",
children: [
@ -521,53 +521,53 @@ export const expertRoutes = [
path: "achievement",
component: () => import("@/views/admin/expert/technology/achievement"),
name: "Achievement",
meta: { title: "成果列表", icon: "list" },
meta: {title: "成果列表", icon: "list"},
},
{
path: "release",
component: () => import("@/views/admin/expert/technology/release"),
hidden: true,
name: "Release",
meta: { title: "发布成果", icon: "list" },
meta: {title: "发布成果", icon: "list"},
},
{
path: "results", // component: () => import("@/views/admin/expert/technology/results"),
component: () => import("@/views/admin/enterprise/extension/results"),
hidden: true,
name: "Results",
meta: { title: "匹配结果", icon: "list", isMatch: false },
meta: {title: "匹配结果", icon: "list", isMatch: false},
},
{
path: "patent",
component: () => import("@/views/admin/expert/technology/patent"),
name: "patent",
meta: { title: "专利列表", icon: "list" },
meta: {title: "专利列表", icon: "list"},
},
{
path: "claimPatent",
component: () => import("@/views/admin/expert/technology/claimPatent"),
hidden: true,
name: "claimPatent",
meta: { title: "认领专利", icon: "list" },
meta: {title: "认领专利", icon: "list"},
},
{
path: "paper",
component: () => import("@/views/admin/expert/technology/paper"),
name: "Paper",
meta: { title: "论文列表", icon: "list" },
meta: {title: "论文列表", icon: "list"},
},
{
path: "research",
component: () => import("@/views/admin/expert/technology/research"),
name: "Research",
meta: { title: "科研项目列表", icon: "list" },
meta: {title: "科研项目列表", icon: "list"},
},
],
},
{
path: "/demand",
component: Layout,
meta: { title: "需求管理", icon: "dashboard" },
meta: {title: "需求管理", icon: "dashboard"},
alwaysShow: true,
redirect: "/demand/serviceDemand",
children: [
@ -575,26 +575,26 @@ export const expertRoutes = [
path: "serviceDemand",
component: () => import("@/views/admin/expert/demand/serviceDemand"),
name: "serviceDemand",
meta: { title: "服务需求", icon: "list" },
meta: {title: "服务需求", icon: "list"},
},
{
path: "release",
component: () => import("@/views/admin/expert/demand/release"),
hidden: true,
name: "release",
meta: { title: "发布需求", icon: "list" },
meta: {title: "发布需求", icon: "list"},
},
{
path: "already",
component: () => import("@/views/admin/expert/demand/already"),
name: "already",
meta: { title: "已合作企业", icon: "list" },
meta: {title: "已合作企业", icon: "list"},
},
{
path: "think",
component: () => import("@/views/admin/expert/demand/think"),
name: "think",
meta: { title: "想合作企业", icon: "list" },
meta: {title: "想合作企业", icon: "list"},
},
],
},
@ -602,7 +602,7 @@ export const expertRoutes = [
{
path: "/activity",
component: Layout,
meta: { title: "活动管理", icon: "dashboard" },
meta: {title: "活动管理", icon: "dashboard"},
alwaysShow: true,
redirect: "/activity/active",
children: [
@ -610,7 +610,7 @@ export const expertRoutes = [
path: "active",
component: () => import("@/views/admin/expert/activity/active"),
name: "Active",
meta: { title: "活动列表", icon: "list" },
meta: {title: "活动列表", icon: "list"},
},
],
},
@ -626,14 +626,14 @@ export const laboratoryRoutes = [
path: "index",
component: () => import("@/views/admin/laboratory/index"),
name: "Index",
meta: { title: "首页", icon: "dashboard", affix: true },
meta: {title: "首页", icon: "dashboard", affix: true},
},
],
},
{
path: "/admin/account",
component: Layout,
meta: { title: "账号管理", icon: "dashboard" },
meta: {title: "账号管理", icon: "dashboard"},
alwaysShow: true,
redirect: "/admin/account/basic-info",
children: [
@ -642,14 +642,14 @@ export const laboratoryRoutes = [
component: () =>
import("@/views/admin/laboratory/account/basic-info.vue"),
name: "basicInfo",
meta: { title: "基本资料", icon: "list" },
meta: {title: "基本资料", icon: "list"},
},
],
},
{
path: "/admin/research",
component: Layout,
meta: { title: "科研管理", icon: "dashboard" },
meta: {title: "科研管理", icon: "dashboard"},
alwaysShow: true,
redirect: "/admin/research/patent",
children: [
@ -658,21 +658,42 @@ export const laboratoryRoutes = [
component: () =>
import("@/views/admin/laboratory/research/patent/index.vue"),
name: "Patent",
meta: { title: "专利列表", icon: "list" },
meta: {title: "专利列表", icon: "list"},
},
/* {
path: "achievement",
// component: () =>
// import("@/views/admin/laboratory/research/achievement/index.vue"),
component: Layout,
name: "Achievement",
// meta: {title: "成果列表", icon: "list"},
children: [
{
path: "/expert-achievement",
component: () => import("@/views/admin/laboratory/research/achievement/index.vue"),
meta: {title: "专家成果", icon: "list"},
name: 'ExpertddAchievement'
}
]
},*/
{
path: "expert-achievement",
component: () => import("@/views/admin/laboratory/research/achievement/index.vue"),
meta: {title: "专家成果", icon: "list"},
name: 'ExpertAchievement'
},
{
path: "achievement",
component: () =>
import("@/views/admin/laboratory/research/achievement/index.vue"),
name: "Achievement",
meta: { title: "成果列表", icon: "list" },
path: "lab-achievement",
component: () => import("@/views/admin/laboratory/research/achievement/index.vue"),
meta: {title: "实验室成果", icon: "list"},
name: 'LabAchievement'
},
{
path: "service-demand",
component: () =>
import("@/views/admin/laboratory/research/service-demand/index.vue"),
name: "ServiceDemand",
meta: { title: "服务需求列表", icon: "list" },
meta: {title: "服务需求列表", icon: "list"},
},
{
path: "service-demand/detail/:id",
@ -680,14 +701,14 @@ export const laboratoryRoutes = [
import("@/views/admin/laboratory/research/service-demand/detail.vue"),
hidden: true,
name: "ServiceDemandDetail",
meta: { title: "查看需求", icon: "list" },
meta: {title: "查看需求", icon: "list"},
},
{
path: "expert",
component: () =>
import("@/views/admin/laboratory/research/expert/index.vue"),
name: "Expert",
meta: { title: "专家列表", icon: "list" },
meta: {title: "专家列表", icon: "list"},
},
{
path: "research-project",
@ -696,14 +717,14 @@ export const laboratoryRoutes = [
"@/views/admin/laboratory/research/research-project/index.vue"
),
name: "ResearchProject",
meta: { title: "科研项目列表", icon: "list" },
meta: {title: "科研项目列表", icon: "list"},
},
{
path: "paper",
component: () =>
import("@/views/admin/laboratory/research/paper/index.vue"),
name: "Paper",
meta: { title: "论文列表", icon: "list" },
meta: {title: "论文列表", icon: "list"},
},
{
path: "paper/unit-info",
@ -711,7 +732,7 @@ export const laboratoryRoutes = [
import("@/views/admin/laboratory/research/paper/unit-info.vue"),
hidden: true,
name: "UnitInfo",
meta: { title: "浏览单位信息", icon: "list" },
meta: {title: "浏览单位信息", icon: "list"},
},
{
path: "laboratory-equipment",
@ -720,7 +741,7 @@ export const laboratoryRoutes = [
"@/views/admin/laboratory/research/laboratory-equipment/index.vue"
),
name: "LaboratoryEquipment",
meta: { title: "实验设备", icon: "list" },
meta: {title: "实验设备", icon: "list"},
},
],
},
@ -737,14 +758,14 @@ export const researchRoutes = [
path: "index",
component: () => import("@/views/admin/research/index"),
name: "Index",
meta: { title: "首页", icon: "dashboard", affix: true },
meta: {title: "首页", icon: "dashboard", affix: true},
},
],
},
{
path: "/admin/account",
component: Layout,
meta: { title: "账号管理", icon: "dashboard" },
meta: {title: "账号管理", icon: "dashboard"},
alwaysShow: true,
redirect: "/admin/account/basic-info",
children: [
@ -753,14 +774,14 @@ export const researchRoutes = [
component: () =>
import("@/views/admin/research/account/basic-info.vue"),
name: "basicInfo",
meta: { title: "基本资料", icon: "list" },
meta: {title: "基本资料", icon: "list"},
},
],
},
{
path: "/admin/research",
component: Layout,
meta: { title: "科研管理", icon: "dashboard" },
meta: {title: "科研管理", icon: "dashboard"},
alwaysShow: true,
redirect: "/admin/research/patent",
children: [
@ -769,14 +790,20 @@ export const researchRoutes = [
component: () =>
import("@/views/admin/research/research/patent/index.vue"),
name: "Patent",
meta: { title: "专利列表", icon: "list" },
meta: {title: "专利列表", icon: "list"},
},
{
path: "achievement",
path: "expert-achievement",
component: () =>
import("@/views/admin/research/research/achievement/index.vue"),
name: "Achievement",
meta: { title: "成果列表", icon: "list" },
name: "ExpertAchievement",
meta: {title: "专家成果列表", icon: "list"},
}, {
path: "research-achievement",
component: () =>
import("@/views/admin/research/research/achievement/index.vue"),
name: "ResearchAchievement",
meta: {title: "科研机构成果列表", icon: "list"},
},
{
path: "service-demand",
@ -784,7 +811,7 @@ export const researchRoutes = [
import("@/views/admin/research/research/service-demand/index.vue"),
name: "ServiceDemand",
hidden: true,
meta: { title: "服务需求列表", icon: "list" },
meta: {title: "服务需求列表", icon: "list"},
},
{
path: "service-demand/detail/:id",
@ -792,28 +819,28 @@ export const researchRoutes = [
import("@/views/admin/research/research/service-demand/detail.vue"),
hidden: true,
name: "ServiceDemandDetail",
meta: { title: "查看需求", icon: "list" },
meta: {title: "查看需求", icon: "list"},
},
{
path: "expert",
component: () =>
import("@/views/admin/research/research/expert/index.vue"),
name: "Expert",
meta: { title: "专家列表", icon: "list" },
meta: {title: "专家列表", icon: "list"},
},
{
path: "research-project",
component: () =>
import("@/views/admin/research/research/research-project/index.vue"),
name: "ResearchProject",
meta: { title: "科研项目列表", icon: "list" },
meta: {title: "科研项目列表", icon: "list"},
},
{
path: "laboratory",
component: () =>
import("@/views/admin/research/research/laboratory/index.vue"),
name: "Laboratory",
meta: { title: "实验室列表", icon: "list" },
meta: {title: "实验室列表", icon: "list"},
},
{
path: "laboratory/edit",
@ -821,7 +848,7 @@ export const researchRoutes = [
import("@/views/admin/research/research/laboratory/edit.vue"),
name: "EditLaboratory",
hidden: true,
meta: { title: "修改实验室", icon: "edit" },
meta: {title: "修改实验室", icon: "edit"},
},
],
},
@ -829,7 +856,7 @@ export const researchRoutes = [
// 客户足迹路由
path: "/admin/footprint",
component: Layout,
meta: { title: "客户足迹", icon: "dashboard" },
meta: {title: "客户足迹", icon: "dashboard"},
alwaysShow: true,
redirect: "/admin/footprint/browsing-history",
children: [
@ -839,7 +866,7 @@ export const researchRoutes = [
component: () =>
import("@/views/admin/research/footprint/browsing-history/index.vue"),
name: "BrowsingHistory",
meta: { title: "浏览数据", icon: "list" },
meta: {title: "浏览数据", icon: "list"},
},
],
},
@ -860,14 +887,14 @@ export const agentRoutes = [
path: "index",
component: () => import("@/views/admin/agent/index"),
name: "Index",
meta: { title: "首页", icon: "dashboard", affix: true },
meta: {title: "首页", icon: "dashboard", affix: true},
},
],
},
{
path: "/admin/service",
component: Layout,
meta: { title: "服务管理", icon: "dashboard" },
meta: {title: "服务管理", icon: "dashboard"},
alwaysShow: true,
redirect: "/admin/service/enterprise",
children: [
@ -876,7 +903,7 @@ export const agentRoutes = [
component: () =>
import("@/views/admin/agent/service/enterprise/index.vue"),
name: "ServiceEnterprise",
meta: { title: "我服务的企业", icon: "list" },
meta: {title: "我服务的企业", icon: "list"},
},
{
path: "technology-demand",
@ -886,14 +913,14 @@ export const agentRoutes = [
),
name: "TechnologyDemandList",
hidden: true,
meta: { title: "技术需求列表", icon: "list" },
meta: {title: "技术需求列表", icon: "list"},
},
{
path: "results",
component: () => import("@/views/admin/enterprise/extension/results"),
hidden: true,
name: "Results",
meta: { title: "匹配结果", icon: "list", isMatch: true },
meta: {title: "匹配结果", icon: "list", isMatch: true},
},
{
path: "technology-demand-release",
@ -903,7 +930,7 @@ export const agentRoutes = [
),
name: "TechnologyDemandRelease",
hidden: true,
meta: { title: "发布需求", icon: "list" },
meta: {title: "发布需求", icon: "list"},
},
{
path: "update-status",
@ -911,7 +938,7 @@ export const agentRoutes = [
import("@/views/admin/agent/service/enterprise/update-status.vue"),
name: "TechnologyDemandUpdateStatus",
hidden: true,
meta: { title: "更新状态", icon: "list" },
meta: {title: "更新状态", icon: "list"},
},
{
path: "matching-demand",
@ -919,7 +946,7 @@ export const agentRoutes = [
import("@/views/admin/agent/service/matching-demand/index.vue"),
name: "EnterpriseDemandMatch",
hidden: true,
meta: { title: "企业需求匹配", icon: "list" },
meta: {title: "企业需求匹配", icon: "list"},
},
{
path: "matching-demand-detail",
@ -927,7 +954,7 @@ export const agentRoutes = [
import("@/views/admin/agent/service/matching-demand/index.vue"),
name: "EnterpriseDemandMatchDetail",
hidden: true,
meta: { title: "企业需求匹配详情", icon: "list" },
meta: {title: "企业需求匹配详情", icon: "list"},
},
],
},
@ -935,7 +962,7 @@ export const agentRoutes = [
{
path: "/admin/account",
component: Layout,
meta: { title: "账号管理", icon: "dashboard" },
meta: {title: "账号管理", icon: "dashboard"},
alwaysShow: true,
redirect: "/admin/account/basic-info",
children: [
@ -943,14 +970,14 @@ export const agentRoutes = [
path: "basic-info",
component: () => import("@/views/admin/agent/account/basic-info.vue"),
name: "basicInfo",
meta: { title: "基本资料", icon: "list" },
meta: {title: "基本资料", icon: "list"},
},
],
},
{
path: "/admin/bill",
component: Layout,
meta: { title: "账单管理", icon: "dashboard" },
meta: {title: "账单管理", icon: "dashboard"},
alwaysShow: true,
redirect: "/admin/bill/bill-list",
children: [
@ -958,7 +985,7 @@ export const agentRoutes = [
path: "bill-list",
component: () => import("@/views/admin/agent/bill/bill-list/index.vue"),
name: "BillList",
meta: { title: "账单列表", icon: "list" },
meta: {title: "账单列表", icon: "list"},
},
],
},
@ -976,7 +1003,7 @@ export const dynamicRoutes = [
path: "role/:userId(\\d+)",
component: () => import("@/views/system/user/authRole"),
name: "AuthRole",
meta: { title: "分配角色", activeMenu: "/system/user" },
meta: {title: "分配角色", activeMenu: "/system/user"},
},
],
},
@ -990,7 +1017,7 @@ export const dynamicRoutes = [
path: "user/:roleId(\\d+)",
component: () => import("@/views/system/role/authUser"),
name: "AuthUser",
meta: { title: "分配用户", activeMenu: "/system/role" },
meta: {title: "分配用户", activeMenu: "/system/role"},
},
],
},
@ -1004,7 +1031,7 @@ export const dynamicRoutes = [
path: "index/:dictId(\\d+)",
component: () => import("@/views/system/dict/data"),
name: "Data",
meta: { title: "字典数据", activeMenu: "/system/dict" },
meta: {title: "字典数据", activeMenu: "/system/dict"},
},
],
},
@ -1018,7 +1045,7 @@ export const dynamicRoutes = [
path: "index",
component: () => import("@/views/monitor/job/log"),
name: "JobLog",
meta: { title: "调度日志", activeMenu: "/monitor/job" },
meta: {title: "调度日志", activeMenu: "/monitor/job"},
},
],
},
@ -1032,7 +1059,7 @@ export const dynamicRoutes = [
path: "index/:tableId(\\d+)",
component: () => import("@/views/tool/gen/editTable"),
name: "GenEdit",
meta: { title: "修改生成配置", activeMenu: "/tool/gen" },
meta: {title: "修改生成配置", activeMenu: "/tool/gen"},
},
],
},
@ -1045,7 +1072,7 @@ const router = createRouter({
if (savedPosition) {
return savedPosition;
} else {
return { top: 0 };
return {top: 0};
}
},
});

25
src/views/admin/agent/account/basic-info.vue
View File

@ -1,32 +1,7 @@
<template>
<div class="app-container">
<el-card shadow="always" style="width: 55%; margin: 0 auto"
><p><b>基本资料</b></p>
<el-form
ref="personFormRef"
:model="personForm"
:rules="rules"
label-width="100px"
>
<el-form-item label="姓名:" prop="nickName">
<el-input v-model="personForm.nickName" placeholder="请输入姓名" />
</el-form-item>
<el-form-item label="手机:" prop="mobile">
<el-input v-model="personForm.mobile" placeholder="请输入手机号" />
</el-form-item>
<el-form-item label="邮箱:" prop="email">
<el-input v-model="personForm.email" placeholder="请输入邮箱" />
</el-form-item>
<el-form-item label="职务:" prop="post">
<el-input v-model="personForm.post" placeholder="请输入职务" />
</el-form-item>
<el-form-item label="固定电话:" prop="phone">
<el-input v-model="personForm.phone" placeholder="请输入固定电话" />
</el-form-item>
<el-form-item>
<el-button type="primary" @click="submitPersonalInfo">提交</el-button>
</el-form-item>
</el-form>
<p><b>实验室资料</b></p>
<!-- <laboratory-form ref="labFormRef" v-model="form" :is-add="false"/>-->
<agent-form ref="agentFormRef" v-model="form" :is-add="false" />

146
src/views/admin/laboratory/research/achievement/index.vue
View File

@ -31,6 +31,9 @@
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col v-if="route.name==='LabAchievement'" :span="1.5">
<el-button icon="UploadFilled" size="small" type="primary" @click="handleImport">导入成果</el-button>
</el-col>
<right-toolbar
v-model:showSearch="showSearch"
@queryTable="getList"
@ -39,7 +42,7 @@
<!-- 表格数据 -->
<el-table v-loading="loading" :data="dataList">
<el-table-column label="数据编号" prop="id" />
<el-table-column label="数据编号" prop="id"/>
<el-table-column
:show-overflow-tooltip="true"
label="成果名称"
@ -50,7 +53,7 @@
label="成果领域"
prop="industryStr"
/>
<el-table-column label="所属专家" prop="expertName" />
<el-table-column v-if="route.name ==='ExpertAchievement'" label="所属专家" prop="expertName"/>
<!-- <el-table-column label="浏览量" prop="visitCount"/>-->
<el-table-column align="center" label="发布时间" prop="createTime">
<template #default="{ row }">
@ -89,30 +92,92 @@
:total="total"
@pagination="getList"
/>
<!-- 用户导入对话框 -->
<el-dialog
v-model="upload.dialogVisible"
append-to-body
title="导入成果"
width="400px"
>
<el-upload
ref="uploadRef"
:action="upload.url"
:auto-upload="false"
:disabled="upload.isUploading"
:headers="upload.headers"
:limit="1"
:on-progress="handleFileUploadProgress"
:on-success="handleFileSuccess"
accept=".xlsx, .xls"
drag
>
<el-icon class="el-icon--upload">
<upload-filled/>
</el-icon>
<div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
<template #tip>
<div class="el-upload__tip text-center">
<span>仅允许导入xls、xlsx格式文件。</span>
<el-link
:underline="false"
style="font-size: 12px; vertical-align: baseline"
type="primary"
@click="saveAs(xlsl, '成果导入模板.xlsx')"
>下载模板
</el-link
>
</div>
<div class="el-upload__tip text-center">
<span style="color: red">成果导入说明(必读)。</span>
<el-link
:underline="false"
style="font-size: 12px; vertical-align: baseline"
type="primary"
@click="saveAs(importTip, '成果导入说明(必读).txt')"
>下载
</el-link
>
</div>
</template>
</el-upload>
<template #footer>
<div class="dialog-footer">
<el-button type="primary" @click="submitFileForm">确 定</el-button>
<el-button @click="upload.dialogVisible = false">取 消</el-button>
</div>
</template>
</el-dialog>
</div>
</template>
<script setup>
import dayjs from "dayjs";
import { ElMessage, ElMessageBox } from "element-plus";
import { useRouter } from "vue-router";
import { getCurrentInstance, reactive, ref, toRefs } from "vue";
import {
achievementList,
deleteAchievements,
} from "@/api/admin/laboratory/achievement";
import {ElMessage, ElMessageBox} from "element-plus";
import {useRouter} from "vue-router";
import {getCurrentInstance, reactive, ref, toRefs} from "vue";
import {achievementList, deleteAchievements, laboratoryAchievementList} from "@/api/admin/laboratory/achievement";
import {getToken} from "@/utils/auth";
import xlsl from '@/assets/achievement_import_template.xlsx?url'
import importTip from '@/assets/achievement_import_description.txt?url'
import {saveAs} from 'file-saver'
const router = useRouter();
const route = useRoute()
const { proxy } = getCurrentInstance();
const {proxy} = getCurrentInstance();
console.log(route.name)
const dataList = ref([]);
const open = ref(false);
const loading = ref(true);
const showSearch = ref(true);
const total = ref(0);
const title = ref("");
const fetchMethods = {
"LabAchievement": laboratoryAchievementList,
"ExpertAchievement": achievementList,
}
const data = reactive({
queryParams: {
pageNum: 1,
@ -121,14 +186,14 @@ const data = reactive({
},
});
const { queryParams } = toRefs(data);
const {queryParams} = toRefs(data);
const queryRef = ref();
/** 查询数据列表 */
const getList = async () => {
loading.value = true;
achievementList(queryParams.value)
fetchMethods[route.name](queryParams.value)
.then((resp) => {
dataList.value = resp.rows;
total.value = resp.total;
@ -169,5 +234,58 @@ function handleDelete(id) {
});
}
const uploadRef = ref(null)
const upload = reactive({
dialogVisible: false,
// 是否显示弹出层（用户导入）
open: false,
// 弹出层标题（用户导入）
title: "",
// 是否禁用上传
isUploading: false,
// 是否更新已经存在的用户数据
updateSupport: 0,
// 设置上传的请求头部
headers: {'client-token': "Bearer " + getToken()},
// 上传的地址
url: import.meta.env.VITE_APP_BASE_API + "/app/laboratory/importData",
})
/**
* 导入成果
*/
const handleImport = () => {
upload.dialogVisible = true
};
/**文件上传中处理 */
const handleFileUploadProgress = (event, file, fileList) => {
upload.isUploading = true;
};
/** 文件上传成功处理 */
const handleFileSuccess = (response, file, fileList) => {
upload.dialogVisible = false;
upload.isUploading = false;
uploadRef.value.handleRemove(file);
proxy.$alert(
"<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
response.msg +
"</div>",
"导入结果",
{dangerouslyUseHTMLString: true}
);
getList();
};
/** 下载模板操作 */
const importTemplate = () => {
saveAs(xlsl, '成果导入模板.xlsx')
}
/** 提交上传文件 */
function submitFileForm() {
uploadRef.value.submit();
}
getList();
</script>

143
src/views/admin/research/research/achievement/index.vue
View File

@ -31,6 +31,11 @@
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button v-if="route.name==='ResearchAchievement'" icon="UploadFilled" size="small" type="primary"
@click="handleImport">导入成果
</el-button>
</el-col>
<right-toolbar
v-model:showSearch="showSearch"
@queryTable="getList"
@ -39,7 +44,7 @@
<!-- 表格数据 -->
<el-table v-loading="loading" :data="dataList">
<el-table-column label="数据编号" prop="id" />
<el-table-column label="数据编号" prop="id"/>
<el-table-column
:show-overflow-tooltip="true"
label="成果名称"
@ -50,7 +55,7 @@
label="成果领域"
prop="industryStr"
/>
<el-table-column label="所属专家" prop="expertName" />
<el-table-column v-if="route.name==='ExpertAchievement'" label="所属专家" prop="expertName"/>
<!-- <el-table-column label="浏览量" prop="visitCount"/>-->
<el-table-column align="center" label="发布时间" prop="createTime">
<template #default="{ row }">
@ -89,18 +94,76 @@
:total="total"
@pagination="getList"
/>
<!-- 用户导入对话框 -->
<el-dialog
v-model="upload.dialogVisible"
append-to-body
title="导入成果"
width="400px"
>
<el-upload
ref="uploadRef"
:action="upload.url"
:auto-upload="false"
:disabled="upload.isUploading"
:headers="upload.headers"
:limit="1"
:on-progress="handleFileUploadProgress"
:on-success="handleFileSuccess"
accept=".xlsx, .xls"
drag
>
<el-icon class="el-icon--upload">
<upload-filled/>
</el-icon>
<div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
<template #tip>
<div class="el-upload__tip text-center">
<span>仅允许导入xls、xlsx格式文件。</span>
<el-link
:underline="false"
style="font-size: 12px; vertical-align: baseline"
type="primary"
@click="saveAs(xlsl, '成果导入模板.xlsx')"
>下载模板
</el-link
>
</div>
<div class="el-upload__tip text-center">
<span style="color: red">成果导入说明(必读)。</span>
<el-link
:underline="false"
style="font-size: 12px; vertical-align: baseline"
type="primary"
@click="saveAs(importTip, '成果导入说明(必读).txt')"
>下载
</el-link
>
</div>
</template>
</el-upload>
<template #footer>
<div class="dialog-footer">
<el-button type="primary" @click="submitFileForm">确 定</el-button>
<el-button @click="upload.dialogVisible = false">取 消</el-button>
</div>
</template>
</el-dialog>
</div>
</template>
<script setup>
import dayjs from "dayjs";
import { useRouter } from "vue-router";
import { reactive, ref, toRefs } from "vue";
import { ElMessage, ElMessageBox } from "element-plus";
import {
achievementList,
deleteAchievements,
} from "@/api/admin/research/achievement";
import {useRoute, useRouter} from "vue-router";
import {reactive, ref, toRefs} from "vue";
import {ElMessage, ElMessageBox} from "element-plus";
import {achievementList, deleteAchievements, researchAchievementList} from "@/api/admin/research/achievement";
import {getToken} from "@/utils/auth";
import xlsl from '@/assets/achievement_import_template.xlsx?url'
import importTip from '@/assets/achievement_import_description.txt?url'
import {saveAs} from "file-saver";
const router = useRouter();
@ -110,7 +173,7 @@ const loading = ref(true);
const showSearch = ref(true);
const total = ref(0);
const title = ref("");
const route = useRoute()
const data = reactive({
queryParams: {
pageNum: 1,
@ -119,14 +182,17 @@ const data = reactive({
},
});
const { queryParams } = toRefs(data);
const {queryParams} = toRefs(data);
const queryRef = ref();
const fetchMethods = {
"ResearchAchievement": researchAchievementList,
"ExpertAchievement": achievementList,
}
/** 查询数据列表 */
const getList = async () => {
loading.value = true;
achievementList(queryParams.value)
fetchMethods[route.name](queryParams.value)
.then((resp) => {
dataList.value = resp.rows;
total.value = resp.total;
@ -164,5 +230,56 @@ function handleDelete(id) {
});
}
const uploadRef = ref(null)
const upload = reactive({
dialogVisible: false,
// 是否显示弹出层（用户导入）
open: false,
// 弹出层标题（用户导入）
title: "",
// 是否禁用上传
isUploading: false,
// 是否更新已经存在的用户数据
updateSupport: 0,
// 设置上传的请求头部
headers: {'client-token': "Bearer " + getToken()},
// 上传的地址
url: import.meta.env.VITE_APP_BASE_API + "/app/research/importData",
})
/**
* 导入成果
*/
const handleImport = () => {
upload.dialogVisible = true
};
/**文件上传中处理 */
const handleFileUploadProgress = (event, file, fileList) => {
upload.isUploading = true;
};
/** 文件上传成功处理 */
const handleFileSuccess = (response, file, fileList) => {
upload.dialogVisible = false;
upload.isUploading = false;
uploadRef.value.handleRemove(file);
proxy.$alert(
"<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
response.msg +
"</div>",
"导入结果",
{dangerouslyUseHTMLString: true}
);
getList();
};
/** 提交上传文件 */
function submitFileForm() {
uploadRef.value.submit();
}
getList();
</script>

30
src/views/components/AgentForm/index.vue
View File

@ -7,7 +7,7 @@
>
<div v-if="showTitle" class="form_title">基本信息</div>
<el-row v-if="isAdd">
<el-row>
<el-col :span="24">
<el-form-item label="姓名:" prop="name">
<el-input v-model="modelValue.name"></el-input>
@ -15,10 +15,10 @@
</el-col>
</el-row>
<el-row v-if="isAdd">
<el-row>
<el-col :span="24">
<el-form-item label="手机号:" prop="mobile">
<el-input v-model="modelValue.mobile"></el-input>
<el-form-item label="手机号:" prop="phone">
<el-input v-model="modelValue.phone"></el-input>
</el-form-item>
</el-col>
</el-row>
@ -34,7 +34,7 @@
<el-row>
<el-col :span="24">
<el-form-item label="工作所在地:" prop="wordAddress">
<el-input v-model="modelValue.wordAddress" />
<el-input v-model="modelValue.wordAddress"/>
</el-form-item>
</el-col>
</el-row>
@ -51,7 +51,7 @@
</el-col>
</el-row>
<field-options ref="researchsFormRef" v-model="modelValue" />
<field-options ref="researchsFormRef" v-model="modelValue"/>
<InputBoxAdd
ref="keywordsFormRef"
@ -120,7 +120,7 @@
<script setup>
import InputBoxAdd from "../InputBoxAdd";
import FieldOptions from "../FieldOptions";
import { ref } from "vue";
import {ref} from "vue";
const formRef = ref();
const researchsFormRef = ref();
@ -141,21 +141,21 @@ const props = defineProps({
},
});
const rules = {
product: [{ required: true, message: "请输入", trigger: "blur" }],
name: [{ required: true, message: "请输入", trigger: "blur" }],
kind: [{ required: true, message: "请选择", trigger: "change" }],
code: [{ required: true, message: "请输入", trigger: "blur" }],
product: [{required: true, message: "请输入", trigger: "blur"}],
name: [{required: true, message: "请输入", trigger: "blur"}],
kind: [{required: true, message: "请选择", trigger: "change"}],
code: [{required: true, message: "请输入", trigger: "blur"}],
mobile: [
{ required: true, message: "请输入手机号码", trigger: "blur" },
{required: true, message: "请输入手机号码", trigger: "blur"},
{
pattern: /^1[3-9]\d{9}$/,
message: "请输入正确的手机号码",
trigger: "blur",
},
],
idCard: [{ required: true, message: "请输入", trigger: "blur" }],
wordAddress: [{ required: true, message: "请输入", trigger: "blur" }],
experience: [{ required: true, message: "请输入", trigger: "blur" }],
idCard: [{required: true, message: "请输入", trigger: "blur"}],
wordAddress: [{required: true, message: "请输入", trigger: "blur"}],
experience: [{required: true, message: "请输入", trigger: "blur"}],
"idImage.0": [
{
required: true,

48
src/views/website/home/comp/index3.vue
View File

@ -1,11 +1,11 @@
<template>
<div class="box3" v-loading="loading">
<div v-loading="loading" class="box3">
<div class="tit">专家分布地图</div>
<div v-if="state.isShowGoBack" class="close-back" @click="goBack">
<img src="./img/back_button.png" />
<img src="./img/back_button.png"/>
</div>
<!-- echartsDom 兼容缩放 -->
<div ref="map" class="map echartsDom" id="map"></div>
<div id="map" ref="map" class="map echartsDom"></div>
<div class="leftBox">
<div class="head">
<div class="a">地区</div>
@ -38,10 +38,10 @@
<div class="b">专家数量</div>
</div>
<div
v-if="Object.keys(industryTree).length > 0"
v-for="(v, k) in industryTree"
v-if="Object.keys(industryTree).length > 0"
>
<div class="a" :title="k">{{ k }}</div>
<div :title="k" class="a">{{ k }}</div>
<div class="b">{{ v ?? 0 }}</div>
</div>
<div v-else>
@ -53,19 +53,15 @@
</template>
<script setup>
import { defineComponent, getCurrentInstance, onMounted, reactive } from "vue";
import {
countExpertByArea,
countExpertByCity,
countExpertByProvince,
} from "../../../../api/website/home/index";
import {getCurrentInstance, onMounted, reactive} from "vue";
import {countExpertByArea, countExpertByCity, countExpertByProvince,} from "../../../../api/website/home/index";
// return;
// console.log(echarts);
import * as echarts from "echarts";
import RegionPagine from "./RegionPagine.vue";
// import { ElMessage } from "element-plus";
const { proxy } = getCurrentInstance();
const {proxy} = getCurrentInstance();
const loading = shallowRef(true);
let treeData = {};
@ -112,7 +108,7 @@ const searchRegionData = async (code, level) => {
snapTree.value = treeData.count ?? [];
return treeData.count.find((item) => item.code == code) || false;
} else {
const { count, industry } = await countExpertByProvince();
const {count, industry} = await countExpertByProvince();
industryTree.value = industry ?? {};
return count.find((item) => item.code == code) || false;
}
@ -122,6 +118,7 @@ const searchRegionData = async (code, level) => {
const findMapCount = (data, code) => {
return data.find((item) => item.code == code) || false;
};
function deepFindTree(code, tree) {
let snap = false;
for (const key in tree) {
@ -142,7 +139,8 @@ function deepFindTree(code, tree) {
return snap;
}
const getIndustry = () => {};
const getIndustry = () => {
};
// function getIndustry(object) {
// let snap = {};
@ -162,9 +160,7 @@ const getIndustry = () => {};
// // for (let index = 0; index < element['industry'].length; index++) {
// // const ele = element['industry'][index];
// // if(Object.hasOwnProperty.call(snap, ele)) {
// // }
// // }
// }
// }
@ -216,7 +212,6 @@ onMounted(() => {
industryTree.value = resp.industry ?? {};
loading.value = false;
});
let height = document.body.clientHeight;
let width = document.body.clientWidth;
let dom = proxy.$refs["map"];
@ -390,10 +385,10 @@ function loadMap(mapName, data) {
orient: "horizontal", //图例排列方向
padding: 5,
pieces: [
{ gte: 0, lte: 99, label: "99", color: "#CAE9FD" },
{ gte: 100, lte: 299, label: "100-299", color: "#7ED2F7" },
{ gte: 300, lte: 499, label: "299-499", color: "#039DDD" },
{ gte: 500, label: "500", color: "#0D4884" },
{gte: 0, lte: 99, label: "99", color: "#CAE9FD"},
{gte: 100, lte: 299, label: "100-299", color: "#7ED2F7"},
{gte: 300, lte: 499, label: "299-499", color: "#039DDD"},
{gte: 500, label: "500", color: "#0D4884"},
// {max: 30, label: '安全', color: '#2c9a42'},
// {min: 30, max: 60, label: '警告', color: '#d08a00'},
// {min: 60, label: '危险', color: '#c23c33'},
@ -467,6 +462,7 @@ function loadMap(mapName, data) {
height: 100%;
background: linear-gradient(0deg, #010101, #041744);
position: relative;
.tit {
position: absolute;
top: 75px;
@ -478,6 +474,7 @@ function loadMap(mapName, data) {
color: #ffffff;
}
}
.map {
width: 100%;
height: 100%;
@ -498,9 +495,11 @@ function loadMap(mapName, data) {
top: 100px;
cursor: pointer;
z-index: 1000;
&:hover {
left: 55px;
}
img {
margin: 28px auto 0;
width: 30px;
@ -508,9 +507,11 @@ function loadMap(mapName, data) {
transition: all 0.5s;
}
}
.leftBox {
left: 6%;
}
.rightBox {
right: 6%;
max-height: 465px !important;
@ -527,13 +528,16 @@ function loadMap(mapName, data) {
background: rgba(4, 22, 65, 0.5);
border: 1px solid #0054ff;
color: rgba(161, 192, 255, 1);
& > div {
display: flex;
}
.head {
border-bottom: 1px solid #0054ff;
color: #ffffff;
}
.a {
flex: 1;
border-right: 1px solid #0054ff;
@ -543,12 +547,14 @@ function loadMap(mapName, data) {
white-space: nowrap;
text-overflow: ellipsis;
}
.b {
text-align: center;
line-height: 42px;
width: 90px;
}
}
.rightBox {
overflow: hidden;
}

4
vite.config.js
View File

@ -31,9 +31,9 @@ export default defineConfig(({ mode, command }) => {
proxy: {
// https://cn.vitejs.dev/config/#server-proxy
"/dev-api": {
target: "http://101.34.131.16:1618",
// target: "http://101.34.131.16:1618",
// target: "http://192.168.0.201:1618",
// target: "http://101.34.131.16:1618",
target: "http://192.168.0.201:1618",
// target: 'http://172.18.3.127:1618',
changeOrigin: true,
rewrite: (p) => p.replace(/^\/dev-api/, ""),