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

提交

Browse Source
This commit is contained in:
lvweijie
2022-09-21 10:34:50 +08:00
parent b5c1eeb94c
commit ab0b5f9011
15 changed files with 64 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.env.development
View File

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

6
.env.production
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

2
.env.staging
View File

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

2
index.html
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,

3
src/components/ImageUpload/index.vue
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
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 467 KiB

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

@ -160,6 +160,11 @@
>
</el-option>
<el-option
value="硕士"
label="硕士"
>
</el-option>
<el-option
value="本科"
label="本科"
>
@ -194,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>
@ -365,7 +370,7 @@ const data = reactive({
major: [{ required: true, message: "请输入", trigger: "blur" }],
job: [{ required: true, message: "请输入", trigger: "blur" }],
title: [{ required: true, message: "请输入", trigger: "blur" }],
workAt: [
workTime: [
{
required: true,
message: "从业时间不能为空",
@ -420,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) {
//企业
@ -438,7 +442,7 @@ const validateForm = async () => {
formValid &&
cityFormValid &&
fieldFormValid &&
keywordsFormValid &&
// keywordsFormValid &&
directionsFormValid
);
} else {

10
src/views/components/FieldOptions/index.vue
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 = [];

3
src/views/components/InputBoxAdd/index.vue
View File

@ -77,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 = "";
};

1
src/views/dataList/enterprise/add.vue
View File

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

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

@ -54,7 +54,7 @@
>导入</el-button
>
</el-col>
<el-col :span="1.5">
<!-- <el-col :span="1.5">
<el-button
type="warning"
plain
@ -63,7 +63,7 @@
@click="handleExport"
>导出</el-button
>
</el-col>
</el-col> -->
<right-toolbar
:showSearch.sync="showSearch"
@queryTable="getList"

2
src/views/dataList/thesis/index.vue
View File

@ -78,7 +78,7 @@
</el-form-item>
<el-form-item label="标签">
<template #default="{row}">
<el-input style="width: 89%;margin-right: 5px;" v-model="formData.tags" placeholder="多个标签（请用','分割）"></el-input><el-button type="primary" style="float: right;" @click="addTag">确认</el-button>
<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>

0
src/views/index12.vue → src/views/index12.vue.bak
View File

32
src/views/login.vue
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 {

2
src/views/register.vue
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"