Compare commits

...

6 Commits

Author SHA1 Message Date
ab0b5f9011 提交 2022-09-21 10:34:50 +08:00
b5c1eeb94c 11 2022-09-09 14:40:05 +08:00
18d86ba26b 1 2022-09-08 10:41:27 +08:00
860ca6a099 测试 2022-09-07 16:12:00 +08:00
385631583a Merge branch 'master' of http://101.43.70.124:3000/cxc/cas_cloud_admin 2022-09-07 14:34:48 +08:00
bb85d109e4 测试 2022-09-07 14:34:42 +08:00
32 changed files with 2299 additions and 943 deletions

View File

@ -1,5 +1,5 @@
# 页面标题
VITE_APP_TITLE = 若依管理系统
VITE_APP_TITLE = 中科云
# 开发环境配置
VITE_APP_ENV = 'development'

View File

@ -1,13 +1,13 @@
# 页面标题
VITE_APP_TITLE = 若依管理系统
VITE_APP_TITLE = 中科云
# 生产环境配置
VITE_APP_ENV = 'production'
# 若依管理系统/生产环境
# VITE_APP_BASE_API = '/prod-api'
VITE_APP_BASE_API = 'http://120.26.107.74:1618'
#VITE_APP_BASE_API = '/api'
#VITE_APP_BASE_API = 'http://120.26.107.74:1618'
VITE_APP_BASE_API = '/api'
# 是否在打包时开启压缩,支持 gzip 和 brotli
VITE_BUILD_COMPRESS = gzip

View File

@ -1,5 +1,5 @@
# 页面标题
VITE_APP_TITLE = 若依管理系统
VITE_APP_TITLE = 中科云
# 生产环境配置
VITE_APP_ENV = 'staging'

View File

@ -7,7 +7,7 @@
<meta name="renderer" content="webkit">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
<link rel="icon" href="/favicon.ico">
<title>若依管理系统</title>
<title>中科云</title>
<!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
<style>
html,

View File

@ -0,0 +1,7 @@
import request from '@/utils/request'
// 获取企业需求列表
export const businessList=(params)=>request({
url:"/business/dataReview/technologyDemandList",
method:'get',
params
})

23
src/api/dataList/list.js Normal file
View File

@ -0,0 +1,23 @@
import request from "@/utils/request";
// 企业审核列表列表
export function enterpriseList(params) {
return request({
url: "/business/enterprise/list",
method: "get",
params,
});
}
// 修改企业类型
export const editType=(data)=>request({
url:`/business/enterprise`,
method:'put',
data
})
// 删除当前项
export const delItem=(id)=>request({
url:`/business/enterprise/${id}`,
method:'delete',
})

29
src/api/expert/expert.js Normal file
View File

@ -0,0 +1,29 @@
import request from '@/utils/request'
// 获取专家列表
export function expertList(params) {
return request({
url:"/business/casExpert/list",
method:"get",
params
});
}
// 新镇专家接口
export const companyAdd=(data)=>request({
url:"/business/casExpert",
method:'post',
data
})
// 专家详情接口
export const companyDetail=(id)=>request({
url:`/business/casExpert/${id}`,
method:'get',
})
// 修改专家详情
export const companyEdit =(data)=>request({
url:'/business/casExpert',
method:'put',
data
})

15
src/api/patent/index.js Normal file
View File

@ -0,0 +1,15 @@
import request from '@/utils/request'
// 获取专利列表
export function expertList(id) {
return request({
url:`/business/casExpert/patent/${id}`,
method:"get"
});
}
// 解除专利
export const delList=(params)=>request({
url:'/business/casExpert/kill',
method:'get',
params
})

34
src/api/thesis/index.js Normal file
View File

@ -0,0 +1,34 @@
import request from '@/utils/request'
// 获取论文列表
export function expertList(params) {
return request({
url:"/business/casPaper/list",
method:"get",
params
});
}
// 删除逻辑
export const delItem=(ids)=>request({
url:`/business/casPaper/${ids}`,
method:'DELETE'
})
// 新增接口
export const addItem=(data)=>request({
url:'/business/casPaper',
method:'post',
data
})
// 获取详情
export const editItem=(id)=>request({
url:`/business/casPaper/${id}`,
method:'GET'
})
// 修改论文
export const rebtnItem=(data)=>request({
url:'/business/casPaper',
method:'PUT',
data
})

View File

@ -180,7 +180,8 @@ function listToString(list, separator) {
separator = 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.replace(baseUrl, "") + separator;
strs += list[i].url + separator;
}
}
return strs != "" ? strs.substr(0, strs.length - 1) : "";

BIN
src/static/login-left..png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 467 KiB

View File

@ -0,0 +1,63 @@
<template>
<div class="app-container">
<!-- 顶部区域 -->
<el-form>
<el-row type="flex">
<el-col :span="8">
<el-button type="primary">待审核</el-button>
<el-button type="">已驳回</el-button>
<el-button type="">已通过</el-button>
</el-col>
<el-col :span="4">
<el-form-item label="站点">
<el-select class="m-2" placeholder="请选择">
<el-option/>
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-form>
<!-- 表格区域 -->
<el-table :data="list">
<el-table-column label="产品名称" align="center" prop="name"></el-table-column>
<el-table-column label="所属领域" align="center" prop="obj"></el-table-column>
<el-table-column label="所属企业" align="center" prop=""></el-table-column>
<el-table-column label="站点" align="center" prop=""></el-table-column>
<el-table-column label="申请时间" align="center" prop="time"></el-table-column>
<el-table-column label="操作" align="center">
<template #default="{row}">
<el-button type="text">审批</el-button>
</template>
</el-table-column>
</el-table>
<!-- 分页器 -->
<el-row type="flex" justify="end" style="margin-top:10px ;">
<el-pagination
v-model:currentPage="currentPage3"
v-model:page-size="pageSize3"
:small="small"
:disabled="disabled"
:page-sizes="[10, 20, 30, 40]"
:background="true"
layout="total, sizes, prev, pager, next, jumper"
:total="6"
/>
</el-row>
</div>
</template>
<script setup>
import { ref } from 'vue';
const list=ref([])
list.value=[
{id:'123',name:'新型高功率LED路灯照明市场分析',obj:'电子信息',time:'2015-09-28 08:50:08'},
{id:'123',name:'一种新型的自动调节升降按摩椅',obj:'电子信息',time:'2015-09-28 08:50:08'},
{id:'123',name:'汽车用先进传感器成果',obj:'电子信息',time:'2015-09-28 08:50:08'},
{id:'123',name:'微波遥感',obj:'电子信息',time:'2015-09-28 08:50:08'},
{id:'123',name:'一种高压电柜的散热控',obj:'电子信息',time:'2015-09-28 08:50:08'},
{id:'123',name:'高电压快充技术',obj:'电子信息',time:'2015-09-28 08:50:08'}
]
</script>
<style></style>

View File

@ -0,0 +1,64 @@
<template>
<div class="app-container">
<!-- 顶部区域 -->
<el-form>
<el-row type="flex">
<el-col :span="8">
<el-button type="primary">待审核</el-button>
<el-button type="">已驳回</el-button>
<el-button type="">已通过</el-button>
</el-col>
<el-col :span="4">
<el-form-item label="站点">
<el-select class="m-2" placeholder="请选择">
<el-option/>
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-form>
<!-- 表格区域 -->
<el-table :data="list">
<el-table-column label="成果名称" align="center" prop="name"></el-table-column>
<el-table-column label="成果领域" align="center" prop="obj"></el-table-column>
<el-table-column label="所属专家" align="center" prop=""></el-table-column>
<el-table-column label="所属研究机构" align="center" prop=""></el-table-column>
<el-table-column label="站点" align="center" prop=""></el-table-column>
<el-table-column label="申请时间" align="center" prop="time"></el-table-column>
<el-table-column label="操作" align="center">
<template #default="{row}">
<el-button type="text">审批</el-button>
</template>
</el-table-column>
</el-table>
<!-- 分页器 -->
<el-row type="flex" justify="end" style="margin-top:10px ;">
<el-pagination
v-model:currentPage="currentPage3"
v-model:page-size="pageSize3"
:small="small"
:disabled="disabled"
:page-sizes="[10, 20, 30, 40]"
:background="true"
layout="total, sizes, prev, pager, next, jumper"
:total="6"
/>
</el-row>
</div>
</template>
<script setup>
import { ref } from 'vue';
const list=ref([])
list.value=[
{name:'新型高功率LED路灯照明市场分析',obj:'电子信息',time:'2015-09-28 08:50:08'},
{name:'一种新型的自动调节升降按摩椅',obj:'电子信息',time:'2015-09-28 08:50:08'},
{name:'一种高压电柜的散热控',obj:'电子信息',time:'2015-09-28 08:50:08'},
{name:'汽车用先进传感器成果',obj:'电子信息',time:'2015-09-28 08:50:08'},
{name:'高电压快充技术',obj:'电子信息',time:'2015-09-28 08:50:08'},
{name:'微波遥感',obj:'电子信息',time:'2015-09-28 08:50:08'}
]
</script>
<style></style>

View File

@ -0,0 +1,107 @@
<template>
<div class="app-container">
<div style="width: 50%">
<ExpertForm
v-model="form"
:showTitle="true"
:formType="formType"
:labelWidth="140"
ref="expertFormRef"
/>
</div>
<el-button @click="submitForm('2')">审批拒绝</el-button>
<el-button type="primary" @click="submitForm('1')">审批通过</el-button>
</div>
</template>
<script setup name="EnterpriseAdd">
import ExpertForm from "@/views/components/ExpertForm/indexcopy.vue";
import tab from "@/plugins/tab";
import {
companyAdd,
companyDetail,
companyEdit,
} from "@/api/dataList/enterprise";
import { reactive, toRefs } from "vue";
import { useRoute, useRouter } from "vue-router";
import { ElMessage } from "element-plus";
const router = useRouter();
const route = useRoute();
const formType = ref(2);
const expertFormRef = ref(null);
const data = reactive({
form: {
image: undefined,
name: undefined,
tenantId: undefined,
province: undefined, // 省code
city: undefined, // 市code
district: undefined, // 区code
address: undefined, // 详细地址
product: undefined,
kind: undefined,
code: undefined,
inviterCode: undefined,
url: undefined,
industrys: [],
keywords: [],
directions: [],
introduce: undefined,
license: undefined,
examineStatus:''
},
});
const { form } = toRefs(data);
const cancel = () => {
router.back();
tab.closeOpenPage();
};
const submitForm = async (state) => {
const valid = await expertFormRef.value.validateForm();
if (valid) {
if (form.value.id != undefined) {
form.value.examineStatus=state
await companyEdit(form.value);
cancel();
ElMessage.success("修改成功");
} else {
await companyAdd(form.value);
cancel();
ElMessage.success("新增成功");
}
} else {
console.log("校验未通过");
}
};
const getDetailById = async () => {
if (route.query.id) {
const { data } = await companyDetail(route.query.id);
form.value = data;
}
};
getDetailById();
</script>
<!-- <script>
export default {
components: {
ExpertForm,
},
data() {
return {
// formType: 2,
// labelWidth: 140,
};
},
methods: {},
created() {
const { id } = this.$route.query;
if (id) {
companyDetail({ id }).then((res) => {
form.value = res.data;
});
}
},
};
</script> -->

View File

@ -0,0 +1,208 @@
<template>
<div class="app-container">
<!-- 顶部搜索区域 -->
<el-form :model="queryData" :inline="true">
<el-form-item label="企业名称">
<el-input style="width: 150px;" v-model="queryData.name" placeholder="请输入关键字"></el-input>
</el-form-item>
<el-form-item label="审核状态">
<el-select style="width: 100px;" v-model="queryData.examineStatus" class="m-2" placeholder="请选择" >
<el-option
label="已审核"
:value="1"
/>
<el-option
label="已拒绝"
:value="2"
/>
</el-select>
</el-form-item>
<el-form-item label="企业类型">
<el-select style="width: 100px;" v-model="queryData.kind" class="m-2" placeholder="请选择" >
<el-option :value="101" label="上市企业"/>
<el-option :value="102" label="优质企业"/>
<el-option :value="103" label="普通企业"/>
</el-select>
</el-form-item>
<el-form-item label="站点">
<SiteOptions v-model="queryData.tenantId" :site-list="siteList" style="width:160px;"/>
</el-form-item>
<el-form-item style="float: right;">
<el-button
type="primary"
icon="search"
size="default"
@click="handleQuery"
>搜索</el-button
>
<el-button icon="refresh" size="default"
@click="resetQuery"
>重置</el-button
>
</el-form-item>
</el-form>
<!--表格区域-->
<el-table :data="dataList" style="width: 100%" border >
<el-table-column prop="name" label="企业名称" align="center"/>
<el-table-column prop="code" label="统一社会信用代码" align="center"/>
<el-table-column label="所属领域" align="center">
<template #default="{ row }">
<div>{{ row.industrys[row.industrys.length - 1] }}</div>
</template>
</el-table-column>
<el-table-column prop="" label="站点" align="center">
<template #default="{ row }">
{{ siteList.find((el) => el.id === row.tenantId)?.name ?? "无" }}
</template>
</el-table-column>
<el-table-column prop="address" label="所在地" align="center"/>
<el-table-column prop="examineStatus" label="审核状态" align="center">
<template #default="{row}">
{{row.examineStatus==='1'?'已通过':'已拒绝'}}
</template>
</el-table-column>
<el-table-column prop="kind" label="企业类型" align="center">
<template #default="{ row }">
<div>
{{ enterpriseOptions.find((e) => row.kind == e.key).value }}
</div>
</template>
</el-table-column>
<el-table-column prop="createdAt" label="申请时间" align="center"/>
<el-table-column prop="" label="操作" width="200px" align="center">
<template #default="{row}">
<el-button
size="small"
type="text"
@click="handleDetail(row.id)"
>审核</el-button
>
<el-button
size="small"
type="text"
@click="delList(row.id)"
>删除</el-button
>
<el-button
size="small"
type="text"
@click="setType(row)"
>设置企业类型</el-button
>
</template>
</el-table-column>
</el-table>
<!-- 分页器 -->
<pagination
v-show="total > 0"
:total="total"
v-model:page="queryData.pageNum"
v-model:limit="queryData.page_size"
@pagination="getList"
/>
<!-- 设置企业类型弹框 -->
<el-dialog title="设置企业类型" v-model="isShow">
<el-row type="flex" justify="center" style="height: 100px;">
<el-radio-group v-model="radioList">
<el-radio label="101">上市企业</el-radio>
<el-radio label="102">优质企业</el-radio>
<el-radio label="103">普通企业</el-radio>
</el-radio-group>
</el-row>
<el-row type="flex" justify="end">
<el-button type="" @click="isShow=false">取消</el-button>
<el-button type="primary" @click="btnType">确认</el-button>
</el-row>
</el-dialog>
</div>
</template>
<script setup>
import SiteOptions from "@/views/components/SiteOptions";
import {enterpriseList,editType,delItem} from '@/api/dataList/list'
import { tenantSelect } from "@/api/subPlatform/tenant";
import { enterpriseOptions } from "@/utils/parameter";
import { reactive, ref } from 'vue';
import {ElMessageBox} from 'element-plus'
import { useRouter } from "vue-router";
const data=reactive({
queryData:{
pageNum:1,
pageSize:10,
examineStatus:''
}
})
const router=useRouter()
const total = ref(0);
const dataList=ref([])
const { queryData } = toRefs(data);
const siteList = ref([]);
const isShow=ref(false)
const radioList=ref('')
// 临时id
const id=ref('')
// 获取企业列表
const getList=async ()=>{
const res=await enterpriseList(queryData.value)
dataList.value=res.rows
total.value=res.total
}
// 获取站点列表
const getSiteList = async () => {
const resp = await tenantSelect();
siteList.value = resp.rows;
};
// 搜索查询
const handleQuery=()=>{
getList(queryData.value);
}
// 重置按钮
const resetQuery = () => {
queryData.value={
pageNum:1,
pageSize:10,
examineStatus:''
}
getList()
};
// 企业类型弹框
const setType=(row)=>{
radioList.value=row.kind
isShow.value=true
id.value=row.id
}
// 发送修改类型请求
const btnType=async ()=>{
await editType({
kind:radioList.value,
id:id.value
})
getList()
isShow.value=false
}
// 删除按钮
const delList=async (id)=>{
ElMessageBox.confirm(`是否确认删除编号为${id}的数据项?`)
.then(async () => {
await delItem(id);
getList();
ElMessage.success("删除成功");
})
.catch(() => {});
getList()
}
// 跳转详情页
const handleDetail = (id) => {
router.push({
path: "/approval/dataList/add",
query: { id },
});
};
getList()
getSiteList()
</script>
<style></style>

View File

@ -0,0 +1,76 @@
<!-- 企业需求弹框 -->
<template>
<el-dialog title="基本信息" v-model="isShow">
<el-form label-width="150px">
<el-form-item label="所属企业">
<el-input placeholder=""></el-input>
</el-form-item>
<el-form-item label="所属需求名称">
<el-input placeholder=""></el-input>
</el-form-item>
<el-form-item label="需求描述">
<Editor></Editor>
</el-form-item>
<el-form-item label="行业分类">
<el-select placeholder="" style="width: 100px;">
<el-option></el-option>
</el-select>
<el-select placeholder="" style="width: 100px;">
<el-option></el-option>
</el-select>
<el-select placeholder="" style="width: 100px;">
<el-option></el-option>
</el-select>
<el-select placeholder="" style="width: 100px;">
<el-option></el-option>
</el-select>
</el-form-item>
<el-form-item label="需求类别">
<el-checkbox-group v-model="checkList">
<el-checkbox label="成果难题解决" />
<el-checkbox label="成果储备/项目投资" />
<el-checkbox label="新成果开发" />
<el-checkbox label="校验检测" />
<el-checkbox label="其他" />
</el-checkbox-group>
</el-form-item>
<el-form-item label="成果需求预算">
<el-input style="width: 200px;" placeholder=""></el-input>万元&nbsp;<input type="checkbox">面议
</el-form-item>
<el-form-item label="截至时间">
<el-input placeholder=""></el-input>
</el-form-item>
<el-row >
<el-col :span="12">
<el-form-item label="需求联系人">
<el-input placeholder=""></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="联系人手机号码">
<el-input placeholder=""></el-input>
</el-form-item>
</el-col>
</el-row>
<el-form-item label="想合作的企业及模式">
<el-input placeholder=""></el-input>
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<el-button type="primary">驳回</el-button>
<el-button type="primary">通过需求</el-button>
</el-row>
</el-dialog>
</template>
<script setup>
import Editor from '@/components/WangEditor'
import { ref } from 'vue';
const props=defineProps({
isShow:{
type:Boolean,
required:true
}
})
const checkList=ref([])
</script>
<style></style>

View File

@ -90,7 +90,7 @@
</el-col>
</el-row>
<el-row v-if="formType == 1">
<!-- <el-row v-if="formType == 1">
<el-col :span="12">
<el-form-item label="所属单位:" prop="researchId">
<el-select
@ -126,7 +126,7 @@
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-row> -->
<CityOptions
v-model="modelValue"
@ -155,10 +155,23 @@
<el-form-item label="最高学历:" prop="education">
<el-select v-model="modelValue.education" placeholder="请选择">
<el-option
v-for="item in educationOptions"
:key="item.text"
:label="item.text"
:value="item.text"
value="博士"
label="博士"
>
</el-option>
<el-option
value="硕士"
label="硕士"
>
</el-option>
<el-option
value="本科"
label="本科"
>
</el-option>
<el-option
value="专科"
label="专科"
>
</el-option>
</el-select>
@ -186,11 +199,11 @@
<el-row v-if="formType == 1">
<el-col :span="12">
<el-form-item label="从业时间:" prop="workAt">
<el-form-item label="从业时间:" prop="workTime">
<el-date-picker
v-model="modelValue.workAt"
v-model="modelValue.workTime"
type="date"
value-format="yyyy-MM-dd"
value-format="YYYY-MM-DD"
placeholder="选择日期"
>
</el-date-picker>
@ -219,7 +232,7 @@
ref="keywordsFormRef"
/>
<InputBoxAdd
<!-- <InputBoxAdd
v-if="formType != 2"
:labelWidth="labelWidth"
v-model="modelValue"
@ -227,7 +240,7 @@
placeholder="请输入研究方向"
fieldKey="researchs"
ref="researchsFormRef"
/>
/> -->
<InputBoxAdd
v-if="formType == 2"
@ -344,7 +357,7 @@ const data = reactive({
trigger: "blur",
},
],
researchId: [{ required: true, message: "请选择", trigger: "change" }],
researchId: [{ message: "请选择", trigger: "change" }],
tenantId: [
{
required: true,
@ -353,11 +366,11 @@ const data = reactive({
},
],
school: [{ required: true, message: "请输入", trigger: "blur" }],
education: [{ required: true, message: "请选择", trigger: "change" }],
education: [{ message: "请选择", trigger: "change" }],
major: [{ required: true, message: "请输入", trigger: "blur" }],
job: [{ required: true, message: "请输入", trigger: "blur" }],
title: [{ required: true, message: "请输入", trigger: "blur" }],
workAt: [
workTime: [
{
required: true,
message: "从业时间不能为空",
@ -412,16 +425,15 @@ const validateForm = async () => {
}
const cityFormValid = await cityFormRef.value.validateForm();
const fieldFormValid = await fieldFormRef.value.validateForm();
const keywordsFormValid = await keywordsFormRef.value.validateForm();
// const keywordsFormValid = await keywordsFormRef.value.validateForm();
if (formType.value == 1) {
//个人
const researchsFormValid = await researchsFormRef.value.validateForm(); // 研究方向验证
// const researchsFormValid = await researchsFormRef.value.validateForm(); //研究方向验证
return (
formValid &&
cityFormValid &&
fieldFormValid &&
keywordsFormValid &&
researchsFormValid
fieldFormValid
// researchsFormValid
);
} else if (formType.value == 2) {
//企业
@ -430,7 +442,7 @@ const validateForm = async () => {
formValid &&
cityFormValid &&
fieldFormValid &&
keywordsFormValid &&
// keywordsFormValid &&
directionsFormValid
);
} else {

View File

@ -0,0 +1,502 @@
<template>
<el-form
ref="formRef"
:model="modelValue"
:rules="rules"
:label-width="labelWidth + 'px'"
>
<div class="form_title" v-if="showTitle">基本信息</div>
<el-row>
<el-col :span="24">
<el-form-item :label="imageName" prop="image">
<ImageUpload v-model="modelValue.image" :fileSize="2" :limit="1" />
</el-form-item>
</el-col>
</el-row>
<el-row v-if="formType == 2">
<el-col :span="24">
<el-form-item :label="nameName" prop="name">
<el-input
v-model="modelValue.name"
:disabled="isAdd ? false : true"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row v-if="formType == 2">
<el-col :span="24">
<el-form-item label="组织机构代码:" prop="code">
<el-row type="flex" justify="space-between">
<el-col :span="20">
<el-input v-model="modelValue.code" :disabled="!isAdd"></el-input>
</el-col>
<el-col :span="3">
<el-button type="primary" @click="" :disabled="!isAdd"
>查找</el-button
>
</el-col>
</el-row>
</el-form-item>
</el-col>
</el-row>
<el-row v-if="formType == 2">
<el-col :span="24">
<el-form-item label="企业类型:" prop="kind">
<el-select v-model="modelValue.kind" placeholder="请选择">
<el-option
v-for="item in enterpriseOptions"
:key="item.key"
:label="item.value"
:value="item.key"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="核心成果核心产品:" prop="product">
<el-input v-model="modelValue.product"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row v-if="formType == 1">
<el-col :span="12">
<el-form-item label="姓名:" prop="name">
<el-input
v-model="modelValue.name"
:disabled="isAdd ? false : true"
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="手机号:" prop="mobile">
<el-input
v-model="modelValue.mobile"
:disabled="isAdd ? false : true"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="所属站点:" prop="tenantId">
<SiteOptions v-model="modelValue.tenantId" :site-list="siteList" />
</el-form-item>
</el-col>
</el-row>
<el-row v-if="formType == 1">
<el-col :span="12">
<el-form-item label="所属单位:" prop="researchId">
<el-select
v-model="modelValue.researchId"
filterable
placeholder="请选择"
@change="setLaboratory"
>
<el-option
v-for="item in researchOptions"
:key="item.id"
:label="item.name"
:value="item.id"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="所属实验室:">
<el-select
v-model="modelValue.laboratory_id"
filterable
placeholder="请选择"
>
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<CityOptions
v-model="modelValue"
:labelWidth="labelWidth"
ref="cityFormRef"
/>
<el-row>
<el-col :span="24">
<el-form-item label="详细地址:">
<el-input v-model="modelValue.address"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row v-if="formType == 1">
<el-col :span="24">
<el-form-item label="毕业院校:" prop="school">
<el-input v-model="modelValue.school"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row v-if="formType == 1">
<el-col :span="12">
<el-form-item label="最高学历:" prop="education">
<el-select v-model="modelValue.education" placeholder="请选择">
<el-option
v-for="item in educationOptions"
:key="item.text"
:label="item.text"
:value="item.text"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="主修专业:" prop="major">
<el-input v-model="modelValue.major"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row v-if="formType == 1">
<el-col :span="12">
<el-form-item label="职务:" prop="job">
<el-input v-model="modelValue.job"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="职称:" prop="title">
<el-input v-model="modelValue.title"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row v-if="formType == 1">
<el-col :span="12">
<el-form-item label="从业时间:" prop="workAt">
<el-date-picker
v-model="modelValue.workAt"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期"
>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="性别:" prop="gender">
<el-radio v-model="modelValue.gender" :label="1">男</el-radio>
<el-radio v-model="modelValue.gender" :label="2">女</el-radio>
</el-form-item>
</el-col>
</el-row>
<FieldOptions
v-model="modelValue"
:labelWidth="labelWidth"
ref="fieldFormRef"
/>
<InputBoxAdd
:labelWidth="labelWidth"
v-model="modelValue"
title="关键词"
placeholder="应用场景关键词+技术产品关键词"
fieldKey="keywords"
ref="keywordsFormRef"
/>
<InputBoxAdd
v-if="formType != 2"
:labelWidth="labelWidth"
v-model="modelValue"
title="研究方向"
placeholder="请输入研究方向"
fieldKey="researchs"
ref="researchsFormRef"
/>
<InputBoxAdd
v-if="formType == 2"
:labelWidth="labelWidth"
v-model="modelValue"
title="生产方向"
placeholder="请输入生产方向"
fieldKey="directions"
ref="directionsFormRef"
/>
<el-row v-if="formType == 2">
<el-col :span="24">
<el-form-item label="邀请码:">
<el-input
v-model="modelValue.inviterCode"
:disabled="!isAdd"
></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="企业网站:">
<el-input v-model="modelValue.url"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row v-if="formType == 2">
<el-col :span="24">
<el-form-item label="营业执照:" prop="license">
<ImageUpload
v-model="modelValue.license"
:isShowTip="false"
:limit="1"
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item :label="introduceName" prop="introduce">
<el-input
v-if="formType == 1"
v-model="modelValue.introduce"
type="textarea"
:autosize="{ minRows: 2, maxRows: 6 }"
/>
<WangEditor v-else v-model="modelValue.introduce" minHeight="150px" />
<!-- <Editor
v-else
v-model="modelValue.introduce"
:minHeight="150"
ref="introduceRef"
@click.native="handleEditAble"
/> -->
</el-form-item>
</el-col>
</el-row>
</el-form>
</template>
<script setup name="ExpertForm">
import CityOptions from "@/views/components/CityOptions";
// import FieldOptions from "@/views/components/FieldOptions";
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 { reactive, ref, toRefs } from "vue";
import WangEditor from "../../../components/WangEditor/index.vue";
import SiteOptions from "@/views/components/SiteOptions";
import FieldOptions from "@/views/components/FieldOptions";
const props = defineProps({
modelValue: { type: Object },
isAdd: {
type: Boolean,
default: true,
},
showTitle: {
type: Boolean,
default: false,
},
formType: {
type: Number,
default: 1,
},
labelWidth: {
type: Number,
default: 120,
},
});
const { formType, modelValue, labelWidth, showTitle, isAdd } = toRefs(props);
const cityFormRef = ref(null);
const formRef = ref(null);
const keywordsFormRef = ref(null);
const researchsFormRef = ref(null);
const fieldFormRef = ref(null);
const directionsFormRef = ref([]);
const researchOptions = ref([]);
const options = ref([]);
const siteList = ref([]);
const data = reactive({
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" }],
mobile: [
{ required: true, message: "请输入", trigger: "blur" },
{
pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
message: "请输入正确的手机号码",
trigger: "blur",
},
],
researchId: [{ required: true, message: "请选择", trigger: "change" }],
tenantId: [
{
required: true,
message: "请选择",
trigger: ["blur", "change"],
},
],
school: [{ required: true, message: "请输入", trigger: "blur" }],
education: [{ required: true, message: "请选择", trigger: "change" }],
major: [{ required: true, message: "请输入", trigger: "blur" }],
job: [{ required: true, message: "请输入", trigger: "blur" }],
title: [{ required: true, message: "请输入", trigger: "blur" }],
workAt: [
{
required: true,
message: "从业时间不能为空",
trigger: ["change", "blur"],
},
],
license: [
{
required: true,
message: "请上传",
trigger: ["blur", "change"],
},
],
introduce: [{ required: true, message: "请输入", trigger: "blur" }],
},
});
const { rules } = toRefs(data);
const introduceName = computed(() => {
if (formType.value === 1) {
return "个人简介:";
} else if (formType.value === 2) {
return "单位简介:";
} else {
return "";
}
});
const imageName = computed(() => {
if (formType.value === 1) {
return "专家头像:";
} else if (formType.value === 2) {
return "企业logo:";
} else {
return "";
}
});
const nameName = computed(() => {
if (formType.value === 2) {
return "单位名称:";
} else {
return "";
}
});
const validateForm = async () => {
let formValid;
try {
formValid = await formRef.value.validate();
} catch (error) {
formValid = false;
}
const cityFormValid = await cityFormRef.value.validateForm();
const fieldFormValid = await fieldFormRef.value.validateForm();
const keywordsFormValid = await keywordsFormRef.value.validateForm();
if (formType.value == 1) {
//个人
const researchsFormValid = await researchsFormRef.value.validateForm(); // 研究方向验证
return (
formValid &&
cityFormValid &&
fieldFormValid &&
keywordsFormValid &&
researchsFormValid
);
} else if (formType.value == 2) {
//企业
const directionsFormValid = await directionsFormRef.value.validateForm(); //生产方向验证
return (
formValid &&
cityFormValid &&
fieldFormValid &&
keywordsFormValid &&
directionsFormValid
);
} else {
throw "未知的formType";
}
};
// 获取站点列表
const getSiteList = async () => {
const resp = await tenantSelect();
siteList.value = resp.rows;
};
getSiteList();
defineExpose({
validateForm,
});
</script>
<!-- <script>
export default {
data() {
return {};
},
watch: {
"modelmodelValue.tenantId"(newOld) {
console.log(newOld);
if (newOld) {
if (this.formType == 1) {
// this.formType == 1 专家表单
// 获取所属单位-研究机构options
researchSelect({ tenantId: newOld }).then(({ data }) => {
this.researchOptions = data;
});
}
} else {
this.researchOptions = [];
if (this.modelmodelValue.researchId) this.modelmodelValue.researchId = undefined;
}
},
},
mounted() {
console.log(this.formType);
if (this.formType != 1) {
// 取消富文本自动聚焦
this.$nextTick(() => {
this.$refs.introduceRef.Quill.enable(false);
});
}
},
methods: {
// 富文本聚焦
handleEditAble() {
this.$refs.introduceRef.Quill.enable(true);
this.$refs.introduceRef.Quill.focus();
},
setLaboratory(e) {
laboratorySelect({ researchId: e }).then((res) => {
console.log(res);
});
},
},
};
</script> -->
<style lang="scss" scoped>
.form_title {
font-weight: 700;
margin-bottom: 30px;
}
</style>

View File

@ -8,10 +8,10 @@
>
<el-row>
<el-col :span="24">
<el-form-item label="所属领域:" required :show-message="false">
<el-form-item label="所属领域:" prop="industrys" :show-message="false">
<el-row type="flex" justify="space-between">
<el-col :span="6">
<el-form-item prop="industrys">
<el-form-item >
<el-select
v-model="fields[0]"
value-key="id"
@ -94,7 +94,7 @@
// import { industry } from "@/api/config";
import { listSysIndustry } from "@/api/platform/industry";
import { ElMessage } from "element-plus";
import { toRefs, watch } from "vue";
import { toRefs, watch ,reactive} from "vue";
const props = defineProps({
modelValue: Object,
@ -119,7 +119,7 @@ const data = reactive({
industrys: [
{
type: "array",
required: true,
required:true,
message: "请选择并添加",
trigger: "change",
},
@ -171,6 +171,8 @@ const getFieldNameById = (ids) => {
// 所属领域添加按钮
const fieldAdd = () => {
if (!fields.value.length) return ElMessage.error("请选择领域类型");
// 移除校验
formRef.value.clearValidate()
industrysTags.value.push(fields.value);
modelValue.value.industrys.push(fields.value.join("-"));
fields.value = [];

View File

@ -12,7 +12,6 @@
:prop="fieldKey"
:rules="[
{
required: true,
type: 'array',
message: '请输入并添加',
trigger: 'change',
@ -78,6 +77,9 @@ const dataVal = ref("");
const formRef = ref(null);
const keyWordAdd = () => {
if (!dataVal.value.length) return ElMessage.error(`请输入${title.value}`);
if(!modelValue.value[fieldKey.value]){
modelValue.value[fieldKey.value]=[]
}
modelValue.value[fieldKey.value].push(dataVal.value);
dataVal.value = "";
};

View File

@ -48,6 +48,7 @@ const data = reactive({
directions: [],
introduce: undefined,
license: undefined,
workTime:''
},
});
const { form } = toRefs(data);

View File

@ -0,0 +1,105 @@
<template>
<div class="app-container">
<div style="width: 50%">
<ExpertForm
v-model="form"
:showTitle="true"
:formType="formType"
:labelWidth="140"
ref="expertFormRef"
/>
</div>
<el-button @click="cancel">取消</el-button>
<el-button type="primary" @click="submitForm">提交</el-button>
</div>
</template>
<script setup name="EnterpriseAdd">
import ExpertForm from "@/views/components/ExpertForm";
import tab from "@/plugins/tab";
import {
companyAdd,
companyDetail,
companyEdit,
} from "@/api/expert/expert";
import { reactive, toRefs } from "vue";
import { useRoute, useRouter } from "vue-router";
import { ElMessage } from "element-plus";
const router = useRouter();
const route = useRoute();
const formType = ref(1);
const expertFormRef = ref(null);
const data = reactive({
form: {
image: undefined,
name: undefined,
tenantId: undefined,
province: undefined, // 省code
city: undefined, // 市code
district: undefined, // 区code
address: undefined, // 详细地址
product: undefined,
kind: undefined,
code: undefined,
inviterCode: undefined,
url: undefined,
industrys: [],
keywords: [],
directions: [],
introduce: undefined,
license: undefined,
},
});
const { form } = toRefs(data);
const cancel = () => {
router.back();
tab.closeOpenPage();
};
const submitForm = async () => {
const valid = await expertFormRef.value.validateForm();
if (valid) {
if (form.value.id != undefined) {
await companyEdit(form.value);
cancel();
ElMessage.success("修改成功");
} else {
await companyAdd(form.value);
cancel();
ElMessage.success("新增成功");
}
} else {
console.log("校验未通过");
}
};
const getDetailById = async () => {
if (route.query.id) {
const { data } = await companyDetail(route.query.id);
form.value = data;
}
};
getDetailById();
</script>
<!-- <script>
export default {
components: {
ExpertForm,
},
data() {
return {
// formType: 2,
// labelWidth: 140,
};
},
methods: {},
created() {
const { id } = this.$route.query;
if (id) {
companyDetail({ id }).then((res) => {
form.value = res.data;
});
}
},
};
</script> -->

View File

@ -0,0 +1,115 @@
<template>
<div class="app-container">
<!-- 顶部搜索区域 -->
<el-form :model="queryData" :inline="true">
<el-form-item label="专利名称">
<el-input v-model="queryData.title" placeholder="请输入专利名称"></el-input>
</el-form-item>
<el-form-item label="申请人">
<el-input v-model="queryData.applyName" placeholder="请输入申请人"></el-input>
</el-form-item>
<el-form-item style="float: right;">
<el-button
type="primary"
icon="search"
size="default"
@click="handleQuery"
>搜索</el-button
>
<el-button icon="refresh" size="default"
@click="resetQuery"
>重置</el-button
>
</el-form-item>
</el-form>
<!--表格区域-->
<el-table :data="dataList" style="width: 100%" >
<el-table-column prop="id" label="数据编号" align="center"/>
<el-table-column label="专利名称" align="center" prop="title" />
<el-table-column prop="applyCode" label="申请号" align="center"/>
<el-table-column prop="applyName" label="申请(专利权人)" align="center"/>
<el-table-column prop="inventor" label="发明人" align="center"/>
<el-table-column prop="applyAt" label="申请日" align="center"/>
<el-table-column prop="examineStatus" label="状态" align="center">
<template #default="{row}">
{{row.isDeleted==='0'?'未删除':'已删除'}}
</template>
</el-table-column>
<el-table-column prop="" label="操作" align="center">
<template #default="{row}">
<el-button
size="small"
type="text"
@click="btndel(row.id)"
>解除</el-button
>
</template>
</el-table-column>
</el-table>
<!-- 分页器 -->
<pagination
v-show="total > 0"
:total="total"
v-model:page="queryData.pageNum"
v-model:limit="queryData.page_size"
@pagination="getList"
/>
</div>
</template>
<script setup>
import { tenantSelect } from "@/api/subPlatform/tenant";
import {expertList,delList} from '@/api/patent/index'
import {useRouter,useRoute } from 'vue-router'
import { ElMessageBox } from 'element-plus'
const router=useRouter()
const route=useRoute()
// console.log(route.query.id);
const data=reactive({
queryData:{
pageNum:1,
pageSize:10,
examineStatus:''
}
})
const total = ref(0);
const dataList=ref([])
const siteList = ref([]);
const { queryData } = toRefs(data);
// 获取专家列表
const getList=async ()=>{
const res=await expertList(route.query.id)
dataList.value=res.rows
total.value=res.total
}
// 获取站点列表
const getSiteList = async () => {
const resp = await tenantSelect();
siteList.value = resp.rows;
};
// 搜索查询
const handleQuery=()=>{
getList(queryData.value);
}
// 重置按钮
const resetQuery = () => {
queryData.value={
pageNum:1,
pageSize:10,
examineStatus:''
}
getList()
};
// 解绑按钮
const btndel=async (id)=>{
await ElMessageBox.confirm('确认解绑吗')
await delList({expertId:route.query.id,patentId:id})
getList()
}
getList()
getSiteList()
</script>
<style></style>

View File

@ -0,0 +1,341 @@
<template>
<div class="app-container">
<el-form
:model="queryParams"
:inline="true"
>
<el-form-item label="姓名" prop="name">
<el-input
v-model="queryParams.name"
placeholder="请输入关键字"
clearable
size="default"
style="width: 240px"
/>
</el-form-item>
<el-form-item label="所属站点" prop="tenantId">
<SiteOptions v-model="queryParams.tenantId" :site-list="siteList" />
</el-form-item>
<el-form-item>
<el-button
type="primary"
icon="search"
size="default"
@click="handleQuery"
>搜索</el-button
>
<el-button icon="refresh" size="default"
@click="resetQuery"
>重置</el-button
>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="plus"
size="default"
@click="handleAdd"
>新增</el-button
>
</el-col>
<el-col :span="1.5">
<el-button
type="info"
plain
icon="upload"
size="default"
@click="handleImport"
>导入</el-button
>
</el-col>
<!-- <el-col :span="1.5">
<el-button
type="warning"
plain
icon="download"
size="default"
@click="handleExport"
>导出</el-button
>
</el-col> -->
<right-toolbar
:showSearch.sync="showSearch"
@queryTable="getList"
></right-toolbar>
</el-row>
<!-- 表格区域 -->
<el-table v-loading="loading" :data="dataList">
<el-table-column label="数据编号" align="center" prop="id" />
<el-table-column label="专家姓名" align="center" prop="name" />
<el-table-column label="研究领域" align="center" show-overflow-tooltip>
<template #default="{ row }">
<div>{{row.industryStr}}</div>
</template>
</el-table-column>
<el-table-column label="学历" align="center" prop="education" />
<el-table-column label="备注" align="center" prop="introduce" />
<el-table-column label="站点" align="center">
<template #default="{ row }">
{{ siteList.find((el) => el.id === row.tenantId)?.name ?? "无" }}
</template>
</el-table-column>
<el-table-column label="所在地" align="center" prop="address" />
<el-table-column label="操作" align="center">
<template #default="{ row }">
<el-button
size="small"
type="text"
icon="edit"
@click="handleDetail(row.id)"
>修改</el-button
>
<el-button
size="small"
type="text"
icon="plus"
@click="handleClaim(row.id)"
>已认领专利</el-button
>
</template>
</el-table-column>
</el-table>
<!-- 分页器 -->
<pagination
v-show="total > 0"
:total="total"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.page_size"
@pagination="getList"
/>
<!-- 用户导入对话框 -->
<el-dialog
:title="upload.title"
v-model="upload.open"
width="400px"
append-to-body
>
<el-upload
ref="uploadRef"
:limit="1"
accept=".xlsx, .xls"
:headers="upload.headers"
:action="upload.url"
:disabled="upload.isUploading"
:on-progress="handleFileUploadProgress"
:on-success="handleFileSuccess"
:auto-upload="false"
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">
<!-- <div class="el-upload__tip">
<el-checkbox
v-model="upload.updateSupport"
/>是否更新已经存在的用户数据
</div> -->
<span>仅允许导入xlsxlsx格式文件</span>
<!-- <el-link
type="primary"
:underline="false"
style="font-size: 12px; vertical-align: baseline"
@click="importTemplate"
>下载模板</el-link
> -->
</div>
</template>
</el-upload>
<template #footer>
<div class="dialog-footer">
<el-button type="primary" @click="submitFileForm"> </el-button>
<el-button @click="upload.open = false"> </el-button>
</div>
</template>
</el-dialog>
</div>
</template>
<script setup>
import SiteOptions from "@/views/components/SiteOptions";
import { tenantSelect } from "@/api/subPlatform/tenant";
import {expertList} from '@/api/expert/expert'
import { useRouter } from "vue-router";
import { getToken } from "@/utils/auth";
import { tansParams, blobValidate } from "@/utils/ruoyi";
import FieldOptions from "@/views/components/FieldOptions";
import { ElLoading, ElMessageBox } from "element-plus";
import dayjs from "dayjs";
import request from "@/utils/request";
const router=useRouter()
const siteList = ref([]);
const dataList = ref([]);
const total = ref(0);
const showSearch = ref(true);
const data=reactive({
queryParams:{
pageNum:1,
pageSize:10,
}
})
/*** 用户导入参数 */
const upload = reactive({
// 是否显示弹出层(用户导入)
open: false,
// 弹出层标题(用户导入)
title: "",
// 是否禁用上传
isUploading: false,
// 是否更新已经存在的用户数据
// updateSupport: 0,
// 设置上传的请求头部
headers: { Authorization: "Bearer " + getToken() },
// 上传的地址
url: import.meta.env.VITE_APP_BASE_API + "/business/enterprise/importData",
});
const { queryParams } = toRefs(data);
// 获取站点列表
const getSiteList = async () => {
const resp = await tenantSelect();
siteList.value = resp.rows;
};
/** 查询专家列表 */
const getList = async () => {
const resp = await expertList(queryParams.value);
dataList.value = resp.rows;
total.value = resp.total;
};
// 新增页面跳转
const handleAdd = () => {
router.push({
path: "/dataList/expert/add",
});
};
// 修改页面 获取详情
const handleDetail = (id) => {
router.push({
path: "/dataList/expert/add",
query: { id },
});
};
// 认领专利
const handleClaim=(id)=>{
router.push({
path: "/dataList/expert/claim",
query:{id}
});
}
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.value.pageNum = 1;
getList();
};
/** 重置按钮操作 */
const resetQuery = () => {
queryParams.value.name=''
queryParams.value.tenantId=''
handleQuery()
};
const uploadRef = ref(null);
/** 导入按钮操作 */
function handleImport() {
upload.title = "用户导入";
upload.open = true;
}
/** 下载模板操作 */
function importTemplate() {
proxy.download(
"system/user/importTemplate",
{},
`user_template_${new Date().getTime()}.xlsx`
);
}
/**文件上传中处理 */
const handleFileUploadProgress = (event, file, fileList) => {
upload.isUploading = true;
};
/** 文件上传成功处理 */
const handleFileSuccess = (response, file, fileList) => {
upload.open = false;
upload.isUploading = false;
uploadRef.value.handleRemove(file);
ElMessageBox.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();
}
const handleDelete = async (id) => {
ElMessageBox.confirm(`是否确认删除编号为${id}的数据项?`)
.then(async () => {
await companyDelete(id);
getList();
ElMessage.success("删除成功");
})
.catch(() => {});
};
let downloadLoadingInstance;
const download = (url, filename) => {
downloadLoadingInstance = ElLoading.service({
text: "正在下载数据,请稍候",
background: "rgba(0, 0, 0, 0.7)",
});
return request
.get(url, {
// transformRequest: [
// (params) => {
// return tansParams(params);
// },
// ],
headers: { "Content-Type": "application/x-www-form-urlencoded" },
responseType: "blob",
})
.then(async (data) => {
const isLogin = await blobValidate(data);
if (isLogin) {
const blob = new Blob([data]);
saveAs(blob, filename);
} else {
const resText = await data.text();
const rspObj = JSON.parse(resText);
const errMsg =
errorCode[rspObj.code] || rspObj.msg || errorCode["default"];
ElMessage.error(errMsg);
}
downloadLoadingInstance.close();
})
.catch((r) => {
console.error(r);
ElMessage.error("下载文件出现错误,请联系管理员!");
downloadLoadingInstance.close();
});
};
const handleExport = () => {
ElMessageBox.confirm(`是否确认企业列表?`).then(() => {
download(
`/business/enterprise/export`,
`企业信息(${dayjs().format("YYYYMMDDHHmmss")}).xlsx`
);
});
};
getSiteList()
getList()
</script>

View File

@ -0,0 +1,205 @@
<template>
<div class="app-container">
<!-- 顶部搜索区域 -->
<el-form :model="queryData" :inline="true">
<el-form-item>
<el-input v-model="queryData.title" placeholder="请输入论文题目" class="m-2" style="width: 300px;"></el-input>
</el-form-item>
<el-form-item label="">
<el-button
type="primary"
icon="search"
size="default"
@click="handleQuery"
>搜索</el-button
>
<el-button icon="refresh" size="default"
@click="resetQuery"
>重置</el-button
>
</el-form-item>
<el-form-item style="float: right;">
<el-button type="primary" @click="btnAdd">新增论文</el-button>
</el-form-item>
</el-form>
<!-- 表格区域 -->
<el-table :data="dataList">
<el-table-column prop="title" label="论文题目" align="center"/>
<el-table-column prop="ext" label="引用格式" align="center"/>
<el-table-column prop="author" label="作者" align="center"/>
<el-table-column prop="tags" label="关键词" align="center">
<template #default="{row}">
{{row.tags}}
</template>
</el-table-column>
<el-table-column prop="publishTime" label="出版日期" align="center"/>
<el-table-column prop="" label="操作" align="center">
<template #default="{row}">
<el-button
size="small"
type="text"
@click="editBtn(row.id)"
>编辑</el-button
>
<el-button
size="small"
type="text"
@click="delList(row.id)"
>删除</el-button
>
</template>
</el-table-column>
</el-table>
<!-- 分页器 -->
<pagination
v-show="total > 0"
:total="total"
v-model:page="queryData.pageNum"
v-model:limit="queryData.page_size"
@pagination="getList"
/>
<!-- 弹出框 -->
<el-dialog :title="formData.id?'编辑论文':'新增论文'" v-model="isShow" @close="close">
<el-form :model="formData" label-width="100px">
<el-form-item label="论文题目">
<el-input v-model="formData.title" placeholder="请输入论文题目"></el-input>
</el-form-item>
<el-form-item label="引用格式">
<el-input v-model="formData.ext" placeholder="请输入引用格式"></el-input>
</el-form-item>
<el-form-item label="作者">
<el-input v-model="formData.author" placeholder="请输入作者"></el-input>
</el-form-item>
<el-form-item label="出版日期">
<el-input v-model="formData.publishTime" placeholder="请输入出版日期"></el-input>
</el-form-item>
<el-form-item label="标签">
<template #default="{row}">
<el-input style="width: 88%;margin-right: 5px;" v-model="formData.tags" placeholder="多个标签(请用','分割)"></el-input><el-button type="primary" style="float: right;" @click="addTag">确认</el-button>
<el-row>
<el-tag type="" closable v-for="val in tags" @close="handleClose(val)">{{val}}</el-tag>
</el-row>
</template>
</el-form-item>
<el-form-item label="摘要">
<el-input
v-model="formData.remark"
:rows="4"
type="textarea"
placeholder="请输入摘要"
/>
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<el-button type="" @click="close">取消</el-button>
<el-button type="primary" v-if="formData.id" @click="btnPut">修改</el-button>
<el-button type="primary" v-else @click="btnReadd">保存</el-button>
</el-row>
</el-dialog>
</div>
</template>
<script setup>
import {expertList,delItem,addItem,editItem,rebtnItem} from '@/api/thesis/index'
import {ElMessageBox,ElMessage } from 'element-plus'
import { reactive,ref,toRefs } from 'vue';
const data=reactive({
queryData:{
pageNum:1,
pageSize:10
}
})
const form=reactive({
formData:{
title:'',
ext:'',
author:'',
publishTime:'',
tags:'',
remark:''
}
})
const {formData}=toRefs(form)
const dataList=ref([])
const total=ref(0)
const isShow=ref(false)
const {queryData}=toRefs(data)
const tags=ref([])
// 获取论文列表
const getList=async ()=>{
const res =await expertList(queryData.value)
dataList.value=res.rows
total.value=res.total
}
// 搜索查询
const handleQuery=()=>{
getList(queryData.value);
}
// 重置按钮
const resetQuery = () => {
queryData.value={
pageNum:1,
pageSize:10,
title:''
}
getList()
};
// 删除按钮
const delList=async (id)=>{
ElMessageBox.confirm(`是否确认删除编号为${id}的数据项?`)
.then(async () => {
await delItem(id);
getList();
ElMessage.success("删除成功");
})
.catch(() => {});
getList()
}
// 新增功能
const btnAdd=()=>{
isShow.value=true
}
// 确认添加标签
const addTag=()=>{
if(!formData.value.tags) return
tags.value.push(formData.value.tags)
formData.value.tags=''
}
// 删除标签
const handleClose=(val)=>{
tags.value.splice(tags.value.indexOf(val), 1)
}
// 添加/编辑
const btnReadd=async ()=>{
formData.value.tags=tags.value.join(',')
await addItem(formData.value)
ElMessage.success('添加成功')
getList()
isShow.value=false
}
// 修改
const btnPut=async ()=>{
formData.value.tags=tags.value.join(',')
await rebtnItem(formData.value)
ElMessage.success('修改成功')
getList()
isShow.value=false
}
// 编辑按钮
const editBtn=async (id)=>{
const data = await editItem(id)
formData.value=data.data
tags.value=formData.value.tags.split(',')
formData.value.tags=''
isShow.value=true
}
// 弹框关闭时间
const close=()=>{
formData.value={}
isShow.value=false
}
getList()
</script>

View File

@ -0,0 +1,78 @@
<template>
<div class="app-container">
<!-- 顶部区域 -->
<el-form>
<el-row type="flex">
<el-col :span="8">
<el-button type="primary">待审核</el-button>
<el-button type="">已驳回</el-button>
<el-button type="">已通过</el-button>
</el-col>
<el-col :span="4">
<el-form-item label="站点">
<el-select class="m-2" placeholder="请选择">
<el-option/>
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-form>
<!-- 表格区域 -->
<el-table :data="list">
<el-table-column label="编号" align="center" prop="id"></el-table-column>
<el-table-column label="需求名称" align="center" prop="title"></el-table-column>
<el-table-column label="所属领域" align="center" prop="industry"></el-table-column>
<el-table-column label="联系人" align="center" prop="name"></el-table-column>
<el-table-column label="手机" align="center" prop="mobile"></el-table-column>
<el-table-column label="所属经纪人" align="center" prop=""></el-table-column>
<el-table-column label="经纪人电话" align="center" prop=""></el-table-column>
<el-table-column label="站点" align="center" prop=""></el-table-column>
<el-table-column label="发布时间" align="center" prop="createTime"></el-table-column>
<el-table-column label="截至日期" align="center" prop="deadline"></el-table-column>
<el-table-column label="操作" align="center">
<template #default="{row}">
<el-button type="text" @click="shenpi(row.id)">审批</el-button>
</template>
</el-table-column>
</el-table>
<!-- 分页器 -->
<el-row type="flex" justify="end" style="margin-top:10px ;">
<el-pagination
v-model:currentPage="currentPage3"
v-model:page-size="pageSize3"
:small="small"
:disabled="disabled"
:page-sizes="[10, 20, 30, 40]"
:background="true"
layout="total, sizes, prev, pager, next, jumper"
:total="6"
/>
</el-row>
<!-- 审批详情 -->
<Edialog :is-show="isShow"></Edialog>
</div>
</template>
<script setup>
import {businessList} from '@/api/Businessneeds/index.js'
import Edialog from '../../views/components/Businessneeds/Approvaldetails.vue'
import { ref,toRefs,defineComponent } from 'vue';
const data=reactive({
queryData:{
pageNum:1,
pageSize:10
}
})
const isShow=ref(false)
const {queryData}=toRefs(data)
const getList=async ()=>{
const res= await businessList(queryData.value)
}
const shenpi=()=>{
isShow.value=true
}
getList()
</script>
<style></style>

View File

@ -0,0 +1,106 @@
<template>
<div class="app-container">
<div style="width: 50%">
<ExpertForm
v-model="form"
:showTitle="true"
:formType="formType"
:labelWidth="140"
ref="expertFormRef"
/>
</div>
<el-button @click="submitForm('2')">拒绝</el-button>
<el-button type="primary" @click="submitForm('1')">通过</el-button>
</div>
</template>
<script setup name="EnterpriseAdd">
import ExpertForm from "@/views/components/ExpertForm";
import tab from "@/plugins/tab";
import {
companyAdd,
companyDetail,
companyEdit,
} from "@/api/expert/expert";
import { reactive, toRefs } from "vue";
import { useRoute, useRouter } from "vue-router";
import { ElMessage } from "element-plus";
const router = useRouter();
const route = useRoute();
const formType = ref(1);
const expertFormRef = ref(null);
const data = reactive({
form: {
image: undefined,
name: undefined,
tenantId: undefined,
province: undefined, // 省code
city: undefined, // 市code
district: undefined, // 区code
address: undefined, // 详细地址
product: undefined,
kind: undefined,
code: undefined,
inviterCode: undefined,
url: undefined,
industrys: [],
keywords: [],
directions: [],
introduce: undefined,
license: undefined,
},
});
const { form } = toRefs(data);
const cancel = () => {
router.back();
tab.closeOpenPage();
};
const submitForm = async (state) => {
const valid = await expertFormRef.value.validateForm();
if (valid) {
if (form.value.id != undefined) {
form.value.examineStatus=state
await companyEdit(form.value);
cancel();
ElMessage.success("修改成功");
} else {
await companyAdd(form.value);
cancel();
ElMessage.success("新增成功");
}
} else {
console.log("校验未通过");
}
};
const getDetailById = async () => {
if (route.query.id) {
const { data } = await companyDetail(route.query.id);
form.value = data;
}
};
getDetailById();
</script>
<!-- <script>
export default {
components: {
ExpertForm,
},
data() {
return {
// formType: 2,
// labelWidth: 140,
};
},
methods: {},
created() {
const { id } = this.$route.query;
if (id) {
companyDetail({ id }).then((res) => {
form.value = res.data;
});
}
},
};
</script> -->

View File

@ -0,0 +1,137 @@
<template>
<div class="app-container">
<!-- 顶部搜索区域 -->
<el-form :model="queryData" :inline="true">
<el-form-item label="专家姓名">
<el-input style="width: 150px;" v-model="queryData.name" placeholder="请输入关键字"></el-input>
</el-form-item>
<el-form-item label="审核状态">
<el-select style="width: 100px;" v-model="queryData.examineStatus" class="m-2" placeholder="请选择" >
<el-option
label="已审核"
:value="1"
/>
<el-option
label="已拒绝"
:value="2"
/>
</el-select>
</el-form-item>
<el-form-item label="站点">
<SiteOptions v-model="queryData.tenantId" :site-list="siteList" style="width:160px;"/>
</el-form-item>
<el-form-item style="float: right;">
<el-button
type="primary"
icon="search"
size="default"
@click="handleQuery"
>搜索</el-button
>
<el-button icon="refresh" size="default"
@click="resetQuery"
>重置</el-button
>
</el-form-item>
</el-form>
<!--表格区域-->
<el-table :data="dataList" style="width: 100%" >
<el-table-column prop="name" label="专家姓名" align="center"/>
<el-table-column label="研究领域" align="center">
<template #default="{ row }">
<div>{{row.industryStr}}</div>
</template>
</el-table-column>
<el-table-column prop="education" label="学历" align="center"/>
<el-table-column prop="introduce" label="个人备注" align="center"/>
<el-table-column prop="school" label="毕业院校" align="center"/>
<el-table-column prop="job" label="职务" align="center"/>
<el-table-column prop="" label="站点" align="center">
<template #default="{ row }">
{{ siteList.find((el) => el.id === row.tenantId)?.name ?? "无" }}
</template>
</el-table-column>
<el-table-column prop="address" label="所在地" align="center"/>
<el-table-column prop="examineStatus" label="审核状态" align="center">
<template #default="{row}">
{{row.examineStatus==='1'?'已通过':'已拒绝'}}
</template>
</el-table-column>
<el-table-column prop="createTime" label="申请时间" align="center"/>
<el-table-column prop="" label="操作" align="center">
<template #default="{row}">
<el-button
size="small"
type="text"
@click="btnAudit(row.id)"
>审核</el-button
>
</template>
</el-table-column>
</el-table>
<!-- 分页器 -->
<pagination
v-show="total > 0"
:total="total"
v-model:page="queryData.pageNum"
v-model:limit="queryData.page_size"
@pagination="getList"
/>
</div>
</template>
<script setup>
import SiteOptions from "@/views/components/SiteOptions";
import { tenantSelect } from "@/api/subPlatform/tenant";
import {expertList} from '@/api/expert/expert'
import {useRouter} from 'vue-router'
const router=useRouter()
const data=reactive({
queryData:{
pageNum:1,
pageSize:10,
examineStatus:''
}
})
const total = ref(0);
const dataList=ref([])
const siteList = ref([]);
const { queryData } = toRefs(data);
// 获取专家列表
const getList=async ()=>{
const res=await expertList(queryData.value)
dataList.value=res.rows
total.value=res.total
}
// 获取站点列表
const getSiteList = async () => {
const resp = await tenantSelect();
siteList.value = resp.rows;
};
// 搜索查询
const handleQuery=()=>{
getList(queryData.value);
}
// 重置按钮
const resetQuery = () => {
queryData.value={
pageNum:1,
pageSize:10,
examineStatus:''
}
getList()
};
// 审核按钮
const btnAudit=(id)=>{
router.push({
path: "/approval/dataList/expert",
query: { id },
});
}
getList()
getSiteList()
</script>
<style></style>

View File

@ -1,907 +1,6 @@
<template>
<div class="app-container home">
<el-row :gutter="20">
<el-col :sm="24" :lg="24">
<blockquote class="text-warning" style="font-size: 14px">
领取阿里云通用云产品1888优惠券
<br />
<el-link
href="https://www.aliyun.com/minisite/goods?userCode=brki8iof"
type="primary"
target="_blank"
>https://www.aliyun.com/minisite/goods?userCode=brki8iof</el-link
>
<br />
领取腾讯云通用云产品2860优惠券
<br />
<el-link
href="https://cloud.tencent.com/redirect.php?redirect=1025&cps_key=198c8df2ed259157187173bc7f4f32fd&from=console"
type="primary"
target="_blank"
>https://cloud.tencent.com/redirect.php?redirect=1025&cps_key=198c8df2ed259157187173bc7f4f32fd&from=console</el-link
>
<br />
阿里云服务器折扣区
<el-link href="http://aly.ruoyi.vip" type="primary" target="_blank"
>>点我进入</el-link
>
&nbsp;&nbsp;&nbsp; 腾讯云服务器秒杀区
<el-link href="http://txy.ruoyi.vip" type="primary" target="_blank"
>>点我进入</el-link
><br />
<h4 class="text-danger">
云产品通用红包可叠加官网常规优惠使用(仅限新用户)
</h4>
</blockquote>
<hr />
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :sm="24" :lg="12" style="padding-left: 20px">
<h2>若依后台管理框架</h2>
<p>
一直想做一款后台管理系统看了很多优秀的开源项目但是发现没有合适自己的于是利用空闲休息时间开始自己写一套后台系统如此有了若依管理系统她可以用于所有的Web应用程序如网站管理后台网站会员中心CMSCRMOA等等当然您也可以对她进行深度定制以做出更强系统所有前端后台代码封装过后十分精简易上手出错概率低同时支持移动客户端访问系统会陆续更新一些实用功能
</p>
<p>
<b>当前版本:</b> <span>v{{ version }}</span>
</p>
<p>
<el-tag type="danger">&yen;免费开源</el-tag>
</p>
<p>
<el-button
type="primary"
icon="Cloudy"
plain
@click="goTarget('https://gitee.com/y_project/RuoYi-Vue')"
>访问码云</el-button
>
<el-button
icon="HomeFilled"
plain
@click="goTarget('http://ruoyi.vip')"
>访问主页</el-button
>
</p>
</el-col>
<el-col :sm="24" :lg="12" style="padding-left: 50px">
<el-row>
<el-col :span="12">
<h2>技术选型</h2>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<h4>后端技术</h4>
<ul>
<li>SpringBoot</li>
<li>Spring Security</li>
<li>JWT</li>
<li>MyBatis</li>
<li>Druid</li>
<li>Fastjson</li>
<li>...</li>
</ul>
</el-col>
<el-col :span="6">
<h4>前端技术</h4>
<ul>
<li>Vue</li>
<li>Vuex</li>
<li>Element-ui</li>
<li>Axios</li>
<li>Sass</li>
<li>Quill</li>
<li>...</li>
</ul>
</el-col>
</el-row>
</el-col>
</el-row>
<el-divider />
<el-row :gutter="20">
<el-col :xs="24" :sm="24" :md="12" :lg="8">
<el-card class="update-log">
<template v-slot:header>
<div class="clearfix">
<span>联系信息</span>
</div>
</template>
<div class="body">
<p>
<i class="el-icon-s-promotion"></i> 官网<el-link
href="http://www.ruoyi.vip"
target="_blank"
>http://www.ruoyi.vip</el-link
>
</p>
<p>
<i class="el-icon-user-solid"></i> QQ群<s>满937441</s> <s>满887144332</s>
<s>满180251782</s> <s>满104180207</s> <s>满186866453</s> <s>满201396349</s>
<s>满101456076</s> <s>满101539465</s> <s>满264312783</s> <s>满167385320</s>
<a href="https://jq.qq.com/?_wv=1027&k=DuWxuULe" target="_blank">
139821253</a
>
</p>
<p>
<i class="el-icon-chat-dot-round"></i> 微信<a
href="javascript:;"
>/ *若依</a
>
</p>
<p>
<i class="el-icon-money"></i> 支付宝<a
href="javascript:;"
class="支付宝信息"
>/ *若依</a
>
</p>
</div>
</el-card>
</el-col>
<el-col :xs="24" :sm="24" :md="12" :lg="8">
<el-card class="update-log">
<template v-slot:header>
<div class="clearfix">
<span>更新日志</span>
</div>
</template>
<el-collapse accordion>
<el-collapse-item title="v3.8.3 - 2022-06-27">
<ol>
<li>新增缓存列表菜单功能</li>
<li>代码生成树表新增(展开/折叠)</li>
<li>Excel注解支持color字体颜色</li>
<li>新增Anonymous匿名访问不鉴权注解</li>
<li>用户头像上传限制只能为图片格式</li>
<li>接口使用泛型使其看到响应属性字段</li>
<li>检查定时任务bean所在包名是否为白名单配置</li>
<li>添加页签openPage支持传递参数</li>
<li>用户缓存信息添加部门ancestors祖级列表</li>
<li>升级element-ui到最新版本2.15.8</li>
<li>升级oshi到最新版本6.1.6</li>
<li>升级druid到最新版本1.2.11</li>
<li>升级fastjson到最新版2.0.8</li>
<li>升级spring-boot到最新版本2.5.14</li>
<li>降级jsencrypt版本兼容IE浏览器</li>
<li>删除多余的salt字段</li>
<li>新增获取不带后缀文件名称方法</li>
<li>新增获取配置文件中的属性值方法</li>
<li>新增内容编码/解码方便插件集成使用</li>
<li>字典类型必须以字母开头且只能为小写字母数字下滑线</li>
<li>优化设置分页参数默认值</li>
<li>优化对空字符串参数处理的过滤</li>
<li>优化显示顺序orderNum类型为整型</li>
<li>优化表单构建按钮不显示正则校验</li>
<li>优化字典数据回显样式下拉框显示值</li>
<li>优化R响应成功状态码与全局保持一致</li>
<li>优化druid开启wall过滤器出现的异常问题</li>
<li>优化用户管理左侧树型组件增加选中高亮保持</li>
<li>优化新增用户与角色信息&用户与岗位信息逻辑</li>
<li>优化默认不启用压缩文件缓存防止node_modules过大</li>
<li>修复字典数据显示不全问题</li>
<li>修复操作日志查询类型条件为0时会查到所有数据</li>
<li>修复Excel注解prompt/combo同时使用不生效问题</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v3.8.2 - 2022-04-01">
<ol>
<li>前端支持设置是否需要防止数据重复提交</li>
<li>开启TopNav没有子菜单情况隐藏侧边栏</li>
<li>侧边栏菜单名称过长悬停显示标题</li>
<li>用户访问控制时校验数据权限防止越权</li>
<li>导出Excel时屏蔽公式防止CSV注入风险</li>
<li>组件ImagePreview支持多图预览显示</li>
<li>组件ImageUpload支持多图同时选择上传</li>
<li>组件FileUpload支持多文件同时选择上传</li>
<li>服务监控新增运行参数信息显示</li>
<li>定时任务目标字符串过滤特殊字符</li>
<li>定时任务目标字符串验证包名白名单</li>
<li>代码生成列表图片支持预览</li>
<li>代码生成编辑修改打开新页签</li>
<li>代码生成新增Java类型Boolean</li>
<li>代码生成子表支持日期/字典配置</li>
<li>代码生成同步保留必填/类型选项</li>
<li>升级oshi到最新版本6.1.2</li>
<li>升级fastjson到最新版1.2.80</li>
<li>升级pagehelper到最新版1.4.1</li>
<li>升级spring-boot到最新版本2.5.11</li>
<li>升级spring-boot-mybatis到最新版2.2.2</li>
<li>添加遗漏的分页参数合理化属性</li>
<li>修改npm即将过期的注册源地址</li>
<li>修复分页组件请求两次问题</li>
<li>修复通用文件下载接口跨域问题</li>
<li>修复Xss注解字段值为空时的异常问题</li>
<li>修复选项卡点击右键刷新丢失参数问题</li>
<li>修复表单清除元素位置未垂直居中问题</li>
<li>修复服务监控中运行参数显示条件错误</li>
<li>修复导入Excel时字典字段类型为Long转义为空问题</li>
<li>修复登录超时刷新页面跳转登录页面还提示重新登录问题</li>
<li>优化加载字典缓存数据</li>
<li>优化IP地址获取到多个的问题</li>
<li>优化任务队列满时任务拒绝策略</li>
<li>优化文件上传兼容Weblogic环境</li>
<li>优化定时任务默认保存到内存中执行</li>
<li>优化部门修改缩放后出现的错位问题</li>
<li>优化Excel格式化不同类型的日期对象</li>
<li>优化菜单表关键字导致的插件报错问题</li>
<li>优化Oracle用户头像列为空时不显示问题</li>
<li>优化页面若未匹配到字典标签则返回原字典值</li>
<li>优化修复登录失效后多次请求提示多次弹窗问题</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v3.8.1 - 2022-01-01">
<ol>
<li>新增Vue3前端代码生成模板</li>
<li>新增图片预览组件</li>
<li>新增压缩插件实现打包Gzip</li>
<li>自定义xss校验注解实现</li>
<li>自定义文字复制剪贴指令</li>
<li>代码生成预览支持复制内容</li>
<li>路由支持单独配置菜单或角色权限</li>
<li>用户管理部门查询选择节点后分页参数初始</li>
<li>修复用户分配角色属性错误</li>
<li>修复打包后字体图标偶现的乱码问题</li>
<li>修复菜单管理重置表单出现的错误</li>
<li>修复版本差异导致的懒加载报错问题</li>
<li>修复Cron组件中周回显问题</li>
<li>修复定时任务多参数逗号分隔的问题</li>
<li>修复根据ID查询列表可能出现的主键溢出问题</li>
<li>修复tomcat配置参数已过期问题</li>
<li>升级clipboard到最新版本2.0.8</li>
<li>升级oshi到最新版本v5.8.6</li>
<li>升级fastjson到最新版1.2.79</li>
<li>升级spring-boot到最新版本2.5.8</li>
<li>升级log4j2到2.17.1防止漏洞风险</li>
<li>优化下载解析blob异常提示</li>
<li>优化代码生成字典组重复问题</li>
<li>优化查询用户的角色组&岗位组代码</li>
<li>优化定时任务cron表达式小时设置24</li>
<li>优化用户导入提示溢出则显示滚动条</li>
<li>优化防重复提交标识组合为(key+url+header)</li>
<li>优化分页方法设置成通用方便灵活调用</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v3.8.0 - 2021-12-01">
<ol>
<li>新增配套并同步的Vue3前端版本</li>
<li>新增通用方法简化模态/缓存/下载/权限/页签使用</li>
<li>优化导出数据/使用通用下载方法</li>
<li>Excel注解支持自定义数据处理器</li>
<li>Excel注解支持导入导出标题信息</li>
<li>Excel导入支持@Excels注解</li>
<li>新增组件data-dict简化数据字典使用</li>
<li>新增Jaxb依赖防止jdk8以上出现的兼容错误</li>
<li>生产环境使用路由懒加载提升页面响应速度</li>
<li>修复五级以上菜单出现的404问题</li>
<li>防重提交注解支持配置间隔时间/提示消息</li>
<li>日志注解新增是否保存响应参数</li>
<li>任务屏蔽违规字符&参数忽略双引号中的逗号</li>
<li>升级SpringBoot到最新版本2.5.6</li>
<li>升级pagehelper到最新版1.4.0</li>
<li>升级spring-boot-mybatis到最新版2.2.0</li>
<li>升级oshi到最新版本v5.8.2</li>
<li>升级druid到最新版1.2.8</li>
<li>升级velocity到最新版本2.3</li>
<li>升级fastjson到最新版1.2.78</li>
<li>升级axios到最新版本0.24.0</li>
<li>升级dart-sass到版本1.32.13</li>
<li>升级core-js到最新版本3.19.1</li>
<li>升级jsencrypt到最新版本3.2.1</li>
<li>升级js-cookie到最新版本3.0.1</li>
<li>升级file-saver到最新版本2.0.5</li>
<li>升级sass-loader到最新版本10.1.1</li>
<li>升级element-ui到最新版本2.15.6</li>
<li>新增sendGet无参请求方法</li>
<li>禁用el-tag组件的渐变动画</li>
<li>代码生成点击预览重置激活tab</li>
<li>AjaxResult重写put方法以方便链式调用</li>
<li>优化登录/验证码请求headers不设置token</li>
<li>优化用户个人信息接口防止修改用户名</li>
<li>优化Cron表达式生成器关闭时销毁避免缓存</li>
<li>优化注册成功提示消息类型success</li>
<li>优化aop语法使用spring自动注入注解</li>
<li>优化记录登录信息移除不必要的修改</li>
<li>优化mybatis全局默认的执行器</li>
<li>优化Excel导入图片可能出现的异常</li>
<li>修复代码生成模板主子表删除缺少事务</li>
<li>修复日志记录可能出现的转换异常</li>
<li>修复代码生成复选框字典遗漏问题</li>
<li>修复关闭xss功能导致可重复读RepeatableFilter失效</li>
<li>修复字符串无法被反转义问题</li>
<li>修复后端主子表代码模板方法名生成错误问题</li>
<li>修复xss过滤后格式出现的异常</li>
<li>修复swagger没有指定dataTypeClass导致启动出现warn日志</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v3.7.0 - 2021-09-13">
<ol>
<li>参数管理支持配置验证码开关</li>
<li>新增是否开启用户注册功能</li>
<li>定时任务支持在线生成cron表达式</li>
<li>菜单管理支持配置路由参数</li>
<li>支持自定义注解实现接口限流</li>
<li>Excel注解支持Image图片导入</li>
<li>自定义弹层溢出滚动样式</li>
<li>自定义可拖动弹窗宽度指令</li>
<li>自定义可拖动弹窗高度指令</li>
<li>修复任意账户越权问题</li>
<li>修改时检查用户数据权限范围</li>
<li>修复保存配置主题颜色失效问题</li>
<li>新增暗色菜单风格主题</li>
<li>菜单&部门新增展开/折叠功能</li>
<li>页签新增关闭左侧&添加图标</li>
<li>顶部菜单排除隐藏的默认路由</li>
<li>顶部菜单同步系统主题样式</li>
<li>跳转路由高亮相对应的菜单栏</li>
<li>代码生成主子表多选行数据</li>
<li>日期范围支持添加多组</li>
<li>升级element-ui到最新版本2.15.5</li>
<li>升级oshi到最新版本v5.8.0</li>
<li>升级commons.io到最新版本v2.11.0</li>
<li>定时任务屏蔽ldap远程调用</li>
<li>定时任务屏蔽http(s)远程调用</li>
<li>补充定时任务表字段注释</li>
<li>定时任务对检查异常进行事务回滚</li>
<li>启用父部门状态排除顶级节点</li>
<li>富文本新增上传文件大小限制</li>
<li>默认首页使用keep-alive缓存</li>
<li>修改代码生成字典回显样式</li>
<li>自定义分页合理化传入参数</li>
<li>修复字典组件值为整形不显示问题</li>
<li>修复定时任务日志执行状态显示</li>
<li>角色&菜单新增字段属性提示信息</li>
<li>修复角色分配用户页面参数类型错误提醒</li>
<li>优化布局设置动画特效</li>
<li>优化异常处理信息</li>
<li>优化错误token导致的解析异常</li>
<li>密码框新增显示切换密码图标</li>
<li>定时任务新增更多操作</li>
<li>更多操作按钮添加权限控制</li>
<li>导入用户样式优化</li>
<li>提取通用方法到基类控制器</li>
<li>优化使用权限工具获取用户信息</li>
<li>优化用户不能删除自己</li>
<li>优化XSS跨站脚本过滤</li>
<li>优化代码生成模板</li>
<li>验证码默认20s超时</li>
<li>BLOB下载时清除URL对象引用</li>
<li>代码生成导入表按创建时间排序</li>
<li>修复代码生成页面数据编辑保存之后总是跳转第一页的问题</li>
<li>修复带safari浏览器无法格式化utc日期格式yyyy-MM-dd'T'HH:mm:ss.SSS问题</li>
<li>多图上传组件移除多余的api地址&验证失败导致图片删除问题&无法删除相应图片修复</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v3.6.0 - 2021-07-12">
<ol>
<li>角色管理新增分配用户功能</li>
<li>用户管理新增分配角色功能</li>
<li>日志列表支持排序操作</li>
<li>优化参数&字典缓存操作</li>
<li>系统布局配置支持动态标题开关</li>
<li>菜单路由配置支持内链访问</li>
<li>默认访问后端首页新增提示语</li>
<li>富文本默认上传返回url类型</li>
<li>新增自定义弹窗拖拽指令</li>
<li>全局注册常用通用组件</li>
<li>全局挂载字典标签组件</li>
<li>ImageUpload组件支持多图片上传</li>
<li>FileUpload组件支持多文件上传</li>
<li>文件上传组件添加数量限制属性</li>
<li>富文本编辑组件添加类型属性</li>
<li>富文本组件工具栏配置视频</li>
<li>封装通用iframe组件</li>
<li>限制超级管理员不允许操作</li>
<li>用户信息长度校验限制</li>
<li>分页组件新增pagerCount属性</li>
<li>添加bat脚本执行应用</li>
<li>升级oshi到最新版本v5.7.4</li>
<li>升级element-ui到最新版本2.15.2</li>
<li>升级pagehelper到最新版1.3.1</li>
<li>升级commons.io到最新版本v2.10.0</li>
<li>升级commons.fileupload到最新版本v1.4</li>
<li>升级swagger到最新版本v3.0.0</li>
<li>修复关闭confirm提示框控制台报错问题</li>
<li>修复存在的SQL注入漏洞问题</li>
<li>定时任务屏蔽rmi远程调用</li>
<li>修复用户搜索分页变量错误</li>
<li>修复导出角色数据范围翻译缺少仅本人</li>
<li>修复表单构建选择下拉选择控制台报错问题</li>
<li>优化图片工具类读取文件</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v3.5.0 - 2021-05-25">
<ol>
<li>新增菜单导航显示风格TopNavfalse为左侧导航菜单true为顶部导航菜单</li>
<li>布局设置支持保存&重置配置</li>
<li>修复树表数据显示不全&加载慢问题</li>
<li>新增IE浏览器版本过低提示页面</li>
<li>用户登录后记录最后登录IP&时间</li>
<li>页面导出按钮点击之后添加遮罩</li>
<li>富文本编辑器支持自定义上传地址</li>
<li>富文本编辑组件新增readOnly属性</li>
<li>页签TagsView新增关闭右侧功能</li>
<li>显隐列组件加载初始默认隐藏列</li>
<li>关闭头像上传窗口还原默认图片</li>
<li>个人信息添加手机&邮箱重复验证</li>
<li>代码生成模板导出按钮点击后添加遮罩</li>
<li>代码生成模板树表操作列添加新增按钮</li>
<li>代码生成模板修复主子表字段重名问题</li>
<li>升级fastjson到最新版1.2.76</li>
<li>升级druid到最新版本v1.2.6</li>
<li>升级mybatis到最新版3.5.6 阻止远程代码执行漏洞</li>
<li>升级oshi到最新版本v5.6.0</li>
<li>velocity剔除commons-collections版本防止3.2.1版本的反序列化漏洞</li>
<li>数据监控页默认账户密码防止越权访问</li>
<li>修复firefox下表单构建拖拽会新打卡一个选项卡</li>
<li>修正后端导入表权限标识</li>
<li>修正前端操作日志&登录日志权限标识</li>
<li>设置Redis配置HashKey序列化</li>
<li>删除操作日志记录信息</li>
<li>上传媒体类型添加视频格式</li>
<li>修复请求形参未传值记录日志异常问题</li>
<li>优化xss校验json请求条件</li>
<li>树级结构更新子节点使用replaceFirst</li>
<li>优化ExcelUtil空值处理</li>
<li>日志记录过滤BindingResult对象防止异常</li>
<li>修改主题后mini类型按钮无效问题</li>
<li>优化通用下载完成后删除节点</li>
<li>通用Controller添加响应返回消息</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v3.4.0 - 2021-02-22">
<ol>
<li>代码生成模板支持主子表</li>
<li>表格右侧工具栏组件支持显隐列</li>
<li>图片组件添加预览&移除功能</li>
<li>Excel注解支持Image图片导出</li>
<li>操作按钮组调整为朴素按钮样式</li>
<li>代码生成支持文件上传组件</li>
<li>代码生成日期控件区分范围</li>
<li>代码生成数据库文本类型生成表单文本域</li>
<li>用户手机邮箱&菜单组件修改允许空字符串</li>
<li>升级SpringBoot到最新版本2.2.13 提升启动速度</li>
<li>升级druid到最新版本v1.2.4</li>
<li>升级fastjson到最新版1.2.75</li>
<li>升级element-ui到最新版本2.15.0</li>
<li>修复IE11浏览器报错问题</li>
<li>优化多级菜单之间切换无法缓存的问题</li>
<li>修复四级菜单无法显示问题</li>
<li>修正侧边栏静态路由丢失问题</li>
<li>修复角色管理-编辑角色-功能权限显示异常</li>
<li>配置文件新增redis数据库索引属性</li>
<li>权限工具类增加admin判断</li>
<li>角色非自定义权限范围清空选择值</li>
<li>修复导入数据为负浮点数时丢失精度问题</li>
<li>移除path-to-regexp正则匹配插件</li>
<li>修复生成树表代码异常</li>
<li>修改ip字段长度防止ipv6地址长度不够</li>
<li>防止get请求参数值为false或0等特殊值会导致无法正确的传参</li>
<li>登录后push添加catch防止出现检查错误</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v3.3.0 - 2020-12-14">
<ol>
<li>新增缓存监控功能</li>
<li>支持主题风格配置</li>
<li>修复多级菜单之间切换无法缓存的问题</li>
<li>多级菜单自动配置组件</li>
<li>代码生成预览支持高亮显示</li>
<li>支持Get请求映射Params参数</li>
<li>删除用户和角色解绑关联</li>
<li>去除用户手机邮箱部门必填验证</li>
<li>Excel支持注解align对齐方式</li>
<li>Excel支持导入Boolean型数据</li>
<li>优化头像样式鼠标移入悬停遮罩</li>
<li>代码生成预览提供滚动机制</li>
<li>代码生成删除多余的数字float类型</li>
<li>修正转换字符串的目标字符集属性</li>
<li>回显数据字典防止空值报错</li>
<li>日志记录增加过滤多文件场景</li>
<li>修改缓存Set方法可能导致嵌套的问题</li>
<li>移除前端一些多余的依赖</li>
<li>防止安全扫描YUI出现的风险提示</li>
<li>修改node-sass为dart-sass</li>
<li>升级SpringBoot到最新版本2.1.18</li>
<li>升级poi到最新版本4.1.2</li>
<li>升级oshi到最新版本v5.3.6</li>
<li>升级bitwalker到最新版本1.21</li>
<li>升级axios到最新版本0.21.0</li>
<li>升级element-ui到最新版本2.14.1</li>
<li>升级vue到最新版本2.6.12</li>
<li>升级vuex到最新版本3.6.0</li>
<li>升级vue-cli到版本4.5.9</li>
<li>升级vue-router到最新版本3.4.9</li>
<li>升级vue-cli到最新版本4.4.6</li>
<li>升级vue-cropper到最新版本0.5.5</li>
<li>升级clipboard到最新版本2.0.6</li>
<li>升级core-js到最新版本3.8.1</li>
<li>升级echarts到最新版本4.9.0</li>
<li>升级file-saver到最新版本2.0.4</li>
<li>升级fuse.js到最新版本6.4.3</li>
<li>升级js-beautify到最新版本1.13.0</li>
<li>升级js-cookie到最新版本2.2.1</li>
<li>升级path-to-regexp到最新版本6.2.0</li>
<li>升级quill到最新版本1.3.7</li>
<li>升级screenfull到最新版本5.0.2</li>
<li>升级sortablejs到最新版本1.10.2</li>
<li>升级vuedraggable到最新版本2.24.3</li>
<li>升级chalk到最新版本4.1.0</li>
<li>升级eslint到最新版本7.15.0</li>
<li>升级eslint-plugin-vue到最新版本7.2.0</li>
<li>升级lint-staged到最新版本10.5.3</li>
<li>升级runjs到最新版本4.4.2</li>
<li>升级sass-loader到最新版本10.1.0</li>
<li>升级script-ext-html-webpack-plugin到最新版本2.1.5</li>
<li>升级svg-sprite-loader到最新版本5.1.1</li>
<li>升级vue-template-compiler到最新版本2.6.12</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v3.2.1 - 2020-11-18">
<ol>
<li>阻止任意文件下载漏洞</li>
<li>代码生成支持上传控件</li>
<li>新增图片上传组件</li>
<li>调整默认首页</li>
<li>升级druid到最新版本v1.2.2</li>
<li>mapperLocations配置支持分隔符</li>
<li>权限信息调整</li>
<li>调整sql默认时间</li>
<li>解决代码生成没有bit类型的问题</li>
<li>升级pagehelper到最新版1.3.0</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v3.2.0 - 2020-10-10">
<ol>
<li>升级springboot版本到2.1.17 提升安全性</li>
<li>升级oshi到最新版本v5.2.5</li>
<li>升级druid到最新版本v1.2.1</li>
<li>升级jjwt到版本0.9.1</li>
<li>升级fastjson到最新版1.2.74</li>
<li>修改sass为node-sass避免el-icon图标乱码</li>
<li>代码生成支持同步数据库</li>
<li>代码生成支持富文本控件</li>
<li>代码生成页面时不忽略remark属性</li>
<li>代码生成添加select必填选项</li>
<li>Excel导出类型NUMERIC支持精度浮点类型</li>
<li>Excel导出targetAttr优化获取值防止get方法不规范</li>
<li>Excel注解支持自动统计数据总和</li>
<li>Excel注解支持设置BigDecimal精度&舍入规则</li>
<li>菜单&数据权限新增展开/折叠 全选/全不选 父子联动</li>
<li>允许用户分配到部门父节点</li>
<li>菜单新增是否缓存keep-alive</li>
<li>表格操作列间距调整</li>
<li>限制系统内置参数不允许删除</li>
<li>富文本组件优化支持自定义高度&图片冲突问题</li>
<li>富文本工具栏样式对齐</li>
<li>导入excel整形值校验优化</li>
<li>修复页签关闭所有时固定标签路由不刷新问题</li>
<li>表单构建布局型组件新增按钮</li>
<li>左侧菜单文字过长显示省略号</li>
<li>修正根节点为子部门时树状结构显示问题</li>
<li>修正调用目标字符串最大长度</li>
<li>修正菜单提示信息错误</li>
<li>修正定时任务执行一次权限标识</li>
<li>修正数据库字符串类型nvarchar</li>
<li>优化递归子节点</li>
<li>优化数据权限判断</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v3.1.0 - 2020-08-13">
<ol>
<li>表格工具栏右侧添加刷新&显隐查询组件</li>
<li>后端支持CORS跨域请求</li>
<li>代码生成支持选择上级菜单</li>
<li>代码生成支持自定义路径</li>
<li>代码生成支持复选框</li>
<li>Excel导出导入支持dictType字典类型</li>
<li>Excel支持分割字符串组内容</li>
<li>验证码类型支持数组计算字符验证</li>
<li>升级vue-cli版本到4.4.4</li>
<li>修改 node-sass dart-sass</li>
<li>表单类型为Integer/Long设置整形默认值</li>
<li>代码生成器默认mapper路径与默认mapperScan路径不一致</li>
<li>优化防重复提交拦截器</li>
<li>优化上级菜单不能选择自己</li>
<li>修复角色的权限分配后未实时生效问题</li>
<li>修复在线用户日志记录类型</li>
<li>修复富文本空格和缩进保存后不生效问题</li>
<li>修复在线用户判断逻辑</li>
<li>唯一限制条件只返回单条数据</li>
<li>添加获取当前的环境配置方法</li>
<li>超时登录后页面跳转到首页</li>
<li>全局异常状态汉化拦截处理</li>
<li>HTML过滤器改为将html转义</li>
<li>检查字符支持小数点&降级改成异常提醒</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v3.0.0 - 2020-07-20">
<ol>
<li>单应用调整为多模块项目</li>
<li>升级element-ui版本到2.13.2</li>
<li>删除babel提高编译速度</li>
<li>新增菜单默认主类目</li>
<li>编码文件名修改为uuid方式</li>
<li>定时任务cron表达式验证</li>
<li>角色权限修改时已有权限未自动勾选异常修复</li>
<li>防止切换权限用户后登录出现404</li>
<li>Excel支持sort导出排序</li>
<li>创建用户不允许选择超级管理员角色</li>
<li>修复代码生成导入表结构出现异常页面不提醒问题</li>
<li>修复代码生成点击多次表修改数据不变化的问题</li>
<li>修复头像上传成功二次打开无法改变裁剪框大小和位置问题</li>
<li>修复布局为small者mini用户表单显示错位问题</li>
<li>修复热部署导致的强换异常问题</li>
<li>修改用户管理复选框宽度防止部分浏览器出现省略号</li>
<li>IpUtils工具清除Xss特殊字符防止Xff注入攻击</li>
<li>生成domain 如果是浮点型 统一用BigDecimal</li>
<li>定时任务调整label-width防止部署出现错位</li>
<li>调整表头固定列默认样式</li>
<li>代码生成模板调整字段为String并且必填则加空串条件</li>
<li>代码生成字典Integer/Long使用parseInt</li>
<li>
修复dict_sort不可update为0的问题&查询返回增加dict_sort升序排序
</li>
<li>修正岗位导出权限注解</li>
<li>禁止加密密文返回前端</li>
<li>修复代码生成页面中的查询条件创建时间未生效的问题</li>
<li>修复首页搜索菜单外链无法点击跳转问题</li>
<li>修复菜单管理选择图标backspace删除时不过滤数据</li>
<li>用户管理部门分支节点不可检查&显示计数</li>
<li>数据范围过滤属性调整</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v2.3.0 - 2020-06-01">
<ol>
<li>升级fastjson到最新版1.2.70 修复高危安全漏洞</li>
<li>dev启动默认打开浏览器</li>
<li>vue-cli使用默认source-map</li>
<li>slidebar eslint报错优化</li>
<li>当tags-view滚动关闭右键菜单</li>
<li>字典管理添加缓存读取</li>
<li>参数管理支持缓存操作</li>
<li>支持一级菜单和主页同级在main区域显示</li>
<li>限制外链地址必须以http(s)开头</li>
<li>tagview & sidebar 主题颜色与element ui(全局)同步</li>
<li>修改数据源类型优先级先根据方法再根据类</li>
<li>支持是否需要设置token属性自定义返回码消息</li>
<li>swagger请求前缀加入配置</li>
<li>登录地点设置内容过长则隐藏显示</li>
<li>修复定时任务执行一次按钮后不提示消息问题</li>
<li>修改上级部门选择项排除本身和下级</li>
<li>通用http发送方法增加参数 contentType 编码类型</li>
<li>更换IP地址查询接口</li>
<li>修复页签变量undefined</li>
<li>添加校验部门包含未停用的子部门</li>
<li>修改定时任务详情下次执行时间日期显示错误</li>
<li>角色管理查询设置默认排序字段</li>
<li>swagger添加enable参数控制是否启用</li>
<li>只对json类型请求构建可重复读取inputStream的request</li>
<li>修改代码生成字典字段int类型没有自动选中问题</li>
<li>vuex用户名取值修正</li>
<li>表格树模板去掉多余的)</li>
<li>代码生成序号修正</li>
<li>全屏情况下不调整上外边距</li>
<li>代码生成Date字段添加默认格式</li>
<li>用户管理角色选择权限控制</li>
<li>修复路由懒加载报错问题</li>
<li>模板sql.vm添加菜单状态</li>
<li>设置用户名称不能修改</li>
<li>dialog添加append-to-body属性防止ie遮罩</li>
<li>菜单区分状态和显示隐藏功能</li>
<li>升级fastjson到最新版1.2.68 修复安全加固</li>
<li>修复代码生成如果选择字典类型缺失逗号问题</li>
<li>登录请求params更换为data防止暴露url</li>
<li>日志返回时间格式处理</li>
<li>添加handle控制允许拖动的元素</li>
<li>布局设置点击扩大范围</li>
<li>代码生成列属性排序查询</li>
<li>代码生成列支持拖动排序</li>
<li>修复时间格式不支持ios问题</li>
<li>表单构建添加父级class防止冲突</li>
<li>定时任务并发属性修正</li>
<li>角色禁用&菜单隐藏不查询权限</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v2.2.0 - 2020-03-18">
<ol>
<li>系统监控新增定时任务功能</li>
<li>添加一个打包Web工程bat</li>
<li>修复页签鼠标滚轮按下的时候可以关闭不可关闭的tag</li>
<li>修复点击退出登录有时会无提示问题</li>
<li>修复防重复提交注解无效问题</li>
<li>修复通知公告批量删除异常问题</li>
<li>添加菜单时路由地址必填限制</li>
<li>代码生成字段描述可编辑</li>
<li>修复用户修改个人信息导致缓存不过期问题</li>
<li>个人信息创建时间获取正确属性值</li>
<li>操作日志详细显示正确类型</li>
<li>导入表单击行数据时选中对应的复选框</li>
<li>批量替换表前缀逻辑调整</li>
<li>固定重定向路径表达式</li>
<li>升级element-ui版本到2.13.0</li>
<li>操作日志排序调整</li>
<li>修复charts切换侧边栏或者缩放窗口显示bug</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v2.1.0 - 2020-02-24">
<ol>
<li>新增表单构建</li>
<li>代码生成支持树表结构</li>
<li>新增用户导入</li>
<li>修复动态加载路由页面刷新问题</li>
<li>修复地址开关无效问题</li>
<li>汉化错误提示页面</li>
<li>代码生成已知问题修改</li>
<li>修复多数据源下配置关闭出现异常处理</li>
<li>添加HTML过滤器用于去除XSS漏洞隐患</li>
<li>修复上传头像控制台出现异常</li>
<li>修改用户管理分页不正确的问题</li>
<li>修复验证码记录提示错误</li>
<li>修复request.js缺少Message引用</li>
<li>修复表格时间为空出现的异常</li>
<li>添加Jackson日期反序列化时区配置</li>
<li>调整根据用户权限加载菜单数据树形结构</li>
<li>调整成功登录不恢复按钮防止多次点击</li>
<li>修改用户个人资料同步缓存信息</li>
<li>修复页面同时出现el-upload和Editor不显示处理</li>
<li>修复在角色管理页修改菜单权限偶尔未选中问题</li>
<li>配置文件新增redis密码属性</li>
<li>设置mybatis全局的配置文件</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v2.0.0 - 2019-12-02">
<ol>
<li>新增代码生成</li>
<li>新增@RepeatSubmit注解防止重复提交</li>
<li>新增菜单主目录添加/删除操作</li>
<li>日志记录过滤特殊对象防止转换异常</li>
<li>修改代码生成路由脚本错误</li>
<li>用户上传头像实时同步缓存无需重新登录</li>
<li>调整切换页签后不重新加载数据</li>
<li>添加jsencrypt实现参数的前端加密</li>
<li>系统退出删除用户缓存记录</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v1.1.0 - 2019-11-11">
<ol>
<li>新增在线用户管理</li>
<li>新增按钮组功能实现批量删除导出清空</li>
<li>新增查询条件重置按钮</li>
<li>新增Swagger全局Token配置</li>
<li>新增后端参数校验</li>
<li>修复字典管理页面的日期查询异常</li>
<li>修改时间函数命名防止冲突</li>
<li>去除菜单上级校验默认为顶级</li>
<li>修复用户密码无法修改问题</li>
<li>修复菜单类型为按钮时不显示权限标识</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v1.0.0 - 2019-10-08">
<ol>
<li>若依前后端分离系统正式发布</li>
</ol>
</el-collapse-item>
</el-collapse>
</el-card>
</el-col>
<el-col :xs="24" :sm="24" :md="12" :lg="8">
<el-card class="update-log">
<template v-slot:header>
<div class="clearfix">
<span>捐赠支持</span>
</div>
</template>
<div class="body">
<img
src="https://oscimg.oschina.net/oscnet/up-d6695f82666e5018f715c41cb7ee60d3b73.png"
alt="donate"
style="width:100%"
/>
<span style="display: inline-block; height: 30px; line-height: 30px"
>你可以请作者喝杯咖啡表示鼓励</span
>
</div>
</el-card>
</el-col>
</el-row>
</div>
</template>
<script setup name="Index">
const version = ref('3.8.3')
function goTarget(url) {
window.open(url, '__blank')
}
<script>
</script>
<style scoped lang="scss">
.home {
blockquote {
padding: 10px 20px;
margin: 0 0 20px;
font-size: 17.5px;
border-left: 5px solid #eee;
}
hr {
margin-top: 20px;
margin-bottom: 20px;
border: 0;
border-top: 1px solid #eee;
}
.col-item {
margin-bottom: 20px;
}
ul {
padding: 0;
margin: 0;
}
font-family: "open sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 13px;
color: #676a6c;
overflow-x: hidden;
ul {
list-style-type: none;
}
h4 {
margin-top: 0px;
}
h2 {
margin-top: 10px;
font-size: 26px;
font-weight: 100;
}
p {
margin-top: 10px;
b {
font-weight: 700;
}
}
.update-log {
ol {
display: block;
list-style-type: decimal;
margin-block-start: 1em;
margin-block-end: 1em;
margin-inline-start: 0;
margin-inline-end: 0;
padding-inline-start: 40px;
}
}
}
</style>
<template>
<div class="app-container"></div>
</template>
<style></style>

View File

@ -1,7 +1,12 @@
<template>
<div class="login">
<el-form ref="loginRef" :model="loginForm" :rules="loginRules" class="login-form">
<h3 class="title">若依后台管理系统</h3>
<el-row>
<el-col :span="12" class="_left">
<img src="../static/login-left..png" alt="">
</el-col>
<el-col :span="12" class="_right">
<h3 class="title">中科云</h3>
<el-form-item prop="username">
<el-input
v-model="loginForm.username"
@ -56,6 +61,8 @@
<router-link class="link-type" :to="'/register'">立即注册</router-link>
</div>
</el-form-item>
</el-col>
</el-row>
</el-form>
<!-- 底部 -->
<div class="el-login-footer">
@ -156,8 +163,10 @@ getCookie();
justify-content: center;
align-items: center;
height: 100%;
background-image: url("../assets/images/login-background.jpg");
background-color: #b1ccff;
background-size: cover;
// background-image: url("../assets/images/login-background.jpg");
// background-size: cover;
}
.title {
margin: 0px auto 30px auto;
@ -168,8 +177,23 @@ getCookie();
.login-form {
border-radius: 6px;
background: #ffffff;
width: 400px;
padding: 25px 25px 5px 25px;
width: 1000px;
._left {
display: flex;
justify-content: center;
align-content: center;
height: 500px;
background: linear-gradient(0deg, #0054ff, #516af5);
img {
width: 495px;
height: 441px;
margin: auto;
}
}
._right {
height: 100%;
padding: 120px 104px 5px 104px;
}
.el-input {
height: 40px;
input {

View File

@ -1,7 +1,7 @@
<template>
<div class="register">
<el-form ref="registerRef" :model="registerForm" :rules="registerRules" class="register-form">
<h3 class="title">若依后台管理系统</h3>
<h3 class="title">中科云</h3>
<el-form-item prop="username">
<el-input
v-model="registerForm.username"