xinyilu/KindergartenUI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev'

Browse Source
This commit is contained in:
纪寒 2022-10-14 17:52:26 +08:00
commit 01e2e8e53b
9 changed files with 273 additions and 283 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.env.development
View File

@ -5,7 +5,7 @@ VUE_APP_TITLE = 智慧幼儿体质评估与促进系统
ENV = 'development' ENV = 'development'
# 智慧幼儿体质评估与促进系统/开发环境 # 智慧幼儿体质评估与促进系统/开发环境
VUE_APP_BASE_API = 'http://192.168.16.81:8081' VUE_APP_BASE_API = 'https://kindergarten.xinelu.cn'
#'/dev-api' #'/dev-api'
# 路由懒加载 # 路由懒加载

BIN
public/favicon.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.5 KiB

After

Width:  |  Height:  |  Size: 11 KiB

363
public/index.html
View File

@ -1,208 +1,213 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head>
<head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="renderer" content="webkit"> <meta name="renderer" content="webkit">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"> <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
<link rel="icon" href="<%= BASE_URL %>favicon.ico"> <!-- <link rel="icon" href="<%= BASE_URL %>favicon.ico"> -->
<title><%= webpackConfig.name %></title> <!-- <link href="../src/assets/logo/logo.png"> -->
<title>
<%= webpackConfig.name %>
</title>
<!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]--> <!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
<style> <style>
html, html,
body, body,
#app { #app {
height: 100%; height: 100%;
margin: 0px; margin: 0px;
padding: 0px; padding: 0px;
} }
.chromeframe {
margin: 0.2em 0;
background: #ccc;
color: #000;
padding: 0.2em 0;
}
#loader-wrapper { .chromeframe {
position: fixed; margin: 0.2em 0;
top: 0; background: #ccc;
left: 0; color: #000;
width: 100%; padding: 0.2em 0;
height: 100%; }
z-index: 999999;
}
#loader { #loader-wrapper {
display: block; position: fixed;
position: relative; top: 0;
left: 50%; left: 0;
top: 50%; width: 100%;
width: 150px; height: 100%;
height: 150px; z-index: 999999;
margin: -75px 0 0 -75px; }
border-radius: 50%;
border: 3px solid transparent;
border-top-color: #FFF;
-webkit-animation: spin 2s linear infinite;
-ms-animation: spin 2s linear infinite;
-moz-animation: spin 2s linear infinite;
-o-animation: spin 2s linear infinite;
animation: spin 2s linear infinite;
z-index: 1001;
}
#loader:before { #loader {
content: ""; display: block;
position: absolute; position: relative;
top: 5px; left: 50%;
left: 5px; top: 50%;
right: 5px; width: 150px;
bottom: 5px; height: 150px;
border-radius: 50%; margin: -75px 0 0 -75px;
border: 3px solid transparent; border-radius: 50%;
border-top-color: #FFF; border: 3px solid transparent;
-webkit-animation: spin 3s linear infinite; border-top-color: #FFF;
-moz-animation: spin 3s linear infinite; -webkit-animation: spin 2s linear infinite;
-o-animation: spin 3s linear infinite; -ms-animation: spin 2s linear infinite;
-ms-animation: spin 3s linear infinite; -moz-animation: spin 2s linear infinite;
animation: spin 3s linear infinite; -o-animation: spin 2s linear infinite;
} animation: spin 2s linear infinite;
z-index: 1001;
}
#loader:after { #loader:before {
content: ""; content: "";
position: absolute; position: absolute;
top: 15px; top: 5px;
left: 15px; left: 5px;
right: 15px; right: 5px;
bottom: 15px; bottom: 5px;
border-radius: 50%; border-radius: 50%;
border: 3px solid transparent; border: 3px solid transparent;
border-top-color: #FFF; border-top-color: #FFF;
-moz-animation: spin 1.5s linear infinite; -webkit-animation: spin 3s linear infinite;
-o-animation: spin 1.5s linear infinite; -moz-animation: spin 3s linear infinite;
-ms-animation: spin 1.5s linear infinite; -o-animation: spin 3s linear infinite;
-webkit-animation: spin 1.5s linear infinite; -ms-animation: spin 3s linear infinite;
animation: spin 1.5s linear infinite; animation: spin 3s linear infinite;
} }
#loader:after {
content: "";
position: absolute;
top: 15px;
left: 15px;
right: 15px;
bottom: 15px;
border-radius: 50%;
border: 3px solid transparent;
border-top-color: #FFF;
-moz-animation: spin 1.5s linear infinite;
-o-animation: spin 1.5s linear infinite;
-ms-animation: spin 1.5s linear infinite;
-webkit-animation: spin 1.5s linear infinite;
animation: spin 1.5s linear infinite;
}
@-webkit-keyframes spin { @-webkit-keyframes spin {
0% { 0% {
-webkit-transform: rotate(0deg); -webkit-transform: rotate(0deg);
-ms-transform: rotate(0deg); -ms-transform: rotate(0deg);
transform: rotate(0deg); transform: rotate(0deg);
} }
100% { 100% {
-webkit-transform: rotate(360deg); -webkit-transform: rotate(360deg);
-ms-transform: rotate(360deg); -ms-transform: rotate(360deg);
transform: rotate(360deg); transform: rotate(360deg);
} }
} }
@keyframes spin { @keyframes spin {
0% { 0% {
-webkit-transform: rotate(0deg); -webkit-transform: rotate(0deg);
-ms-transform: rotate(0deg); -ms-transform: rotate(0deg);
transform: rotate(0deg); transform: rotate(0deg);
} }
100% { 100% {
-webkit-transform: rotate(360deg); -webkit-transform: rotate(360deg);
-ms-transform: rotate(360deg); -ms-transform: rotate(360deg);
transform: rotate(360deg); transform: rotate(360deg);
} }
} }
#loader-wrapper .loader-section {
position: fixed;
top: 0;
width: 51%;
height: 100%;
background: #7171C6;
z-index: 1000;
-webkit-transform: translateX(0);
-ms-transform: translateX(0);
transform: translateX(0);
}
#loader-wrapper .loader-section { #loader-wrapper .loader-section.section-left {
position: fixed; left: 0;
top: 0; }
width: 51%;
height: 100%;
background: #7171C6;
z-index: 1000;
-webkit-transform: translateX(0);
-ms-transform: translateX(0);
transform: translateX(0);
}
#loader-wrapper .loader-section.section-left { #loader-wrapper .loader-section.section-right {
left: 0; right: 0;
} }
#loader-wrapper .loader-section.section-right { .loaded #loader-wrapper .loader-section.section-left {
right: 0; -webkit-transform: translateX(-100%);
} -ms-transform: translateX(-100%);
transform: translateX(-100%);
-webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
}
.loaded #loader-wrapper .loader-section.section-right {
-webkit-transform: translateX(100%);
-ms-transform: translateX(100%);
transform: translateX(100%);
-webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
}
.loaded #loader-wrapper .loader-section.section-left { .loaded #loader {
-webkit-transform: translateX(-100%); opacity: 0;
-ms-transform: translateX(-100%); -webkit-transition: all 0.3s ease-out;
transform: translateX(-100%); transition: all 0.3s ease-out;
-webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000); }
transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
}
.loaded #loader-wrapper .loader-section.section-right { .loaded #loader-wrapper {
-webkit-transform: translateX(100%); visibility: hidden;
-ms-transform: translateX(100%); -webkit-transform: translateY(-100%);
transform: translateX(100%); -ms-transform: translateY(-100%);
-webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000); transform: translateY(-100%);
transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000); -webkit-transition: all 0.3s 1s ease-out;
} transition: all 0.3s 1s ease-out;
}
.loaded #loader { .no-js #loader-wrapper {
opacity: 0; display: none;
-webkit-transition: all 0.3s ease-out; }
transition: all 0.3s ease-out;
}
.loaded #loader-wrapper { .no-js h1 {
visibility: hidden; color: #222222;
-webkit-transform: translateY(-100%); }
-ms-transform: translateY(-100%);
transform: translateY(-100%);
-webkit-transition: all 0.3s 1s ease-out;
transition: all 0.3s 1s ease-out;
}
.no-js #loader-wrapper { #loader-wrapper .load_title {
display: none; font-family: 'Open Sans';
} color: #FFF;
font-size: 19px;
width: 100%;
text-align: center;
z-index: 9999999999999;
position: absolute;
top: 60%;
opacity: 1;
line-height: 30px;
}
.no-js h1 { #loader-wrapper .load_title span {
color: #222222; font-weight: normal;
} font-style: italic;
font-size: 13px;
color: #FFF;
opacity: 0.5;
}
</style>
</head>
#loader-wrapper .load_title { <body>
font-family: 'Open Sans';
color: #FFF;
font-size: 19px;
width: 100%;
text-align: center;
z-index: 9999999999999;
position: absolute;
top: 60%;
opacity: 1;
line-height: 30px;
}
#loader-wrapper .load_title span {
font-weight: normal;
font-style: italic;
font-size: 13px;
color: #FFF;
opacity: 0.5;
}
</style>
</head>
<body>
<div id="app"> <div id="app">
<div id="loader-wrapper"> <div id="loader-wrapper">
<div id="loader"></div> <div id="loader"></div>
<div class="loader-section section-left"></div> <div class="loader-section section-left"></div>
<div class="loader-section section-right"></div> <div class="loader-section section-right"></div>
<div class="load_title">正在加载系统资源，请耐心等待</div> <div class="load_title">正在加载系统资源，请耐心等待</div>
</div> </div>
</div> </div>
</body> </body>
</html> </html>

11
src/layout/index.vue
View File

@ -72,8 +72,8 @@ export default {
return variables; return variables;
}, },
}, },
created(){ created() {
this.info() this.info();
}, },
watch: { watch: {
$route(to, from) { $route(to, from) {
@ -86,9 +86,10 @@ export default {
}, },
}, },
methods: { methods: {
info(){ info() {
console.log(this.$router.path) console.log(this.$router.path);
if (this.$router.path != "/index") { console.log(this.$route.path);
if (this.$route.path != "/index") {
this.show = false; this.show = false;
} else { } else {
this.show = true; this.show = true;

70
src/settings.js
View File

@ -1,44 +1,44 @@
module.exports = { module.exports = {
/** /**
* 侧边栏主题 深色主题theme-dark，浅色主题theme-light * 侧边栏主题 深色主题theme-dark，浅色主题theme-light
*/ */
sideTheme: 'theme-dark', sideTheme: 'theme-dark',
/** /**
* 是否系统布局配置 * 是否系统布局配置
*/ */
showSettings: false, showSettings: false,
/** /**
* 是否显示顶部导航 * 是否显示顶部导航
*/ */
topNav: false, topNav: false,
/** /**
* 是否显示 tagsView * 是否显示 tagsView
*/ */
tagsView: true, tagsView: true,
/** /**
* 是否固定头部 * 是否固定头部
*/ */
fixedHeader: false, fixedHeader: false,
/** /**
* 是否显示logo * 是否显示logo
*/ */
sidebarLogo: true, sidebarLogo: true,
/** /**
* 是否显示动态标题 * 是否显示动态标题
*/ */
dynamicTitle: false, dynamicTitle: false,
/** /**
* @type {string | array} 'production' | ['production', 'development'] * @type {string | array} 'production' | ['production', 'development']
* @description Need show err logs component. * @description Need show err logs component.
* The default is only used in the production env * The default is only used in the production env
* If you want to also use it in dev, you can pass ['production', 'development'] * If you want to also use it in dev, you can pass ['production', 'development']
*/ */
errorLog: 'production' errorLog: 'production'
} }

25
src/views/system/info/index.vue
View File

@ -175,11 +175,7 @@
v-model="form.parentId" v-model="form.parentId"
/> />
</el-form-item> </el-form-item>
<el-form-item <el-form-item label="所属区域" prop="areaId">
label="所属区域"
prop="areaId"
v-if="List.length != 0 && form.parentId != 0"
>
<el-select <el-select
v-model="value" v-model="value"
placeholder="请选择省" placeholder="请选择省"
@ -224,23 +220,6 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="所属区域" prop="areaId" v-else>
<el-select
v-model="form.areaName"
placeholder="请选择省"
style="width: 380px"
disabled
>
<el-option
v-for="item in provincelist"
:key="item.areaId"
:label="item.name"
:value="item.areaId"
@click.native="province(item)"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="组织名称" prop="organizeName"> <el-form-item label="组织名称" prop="organizeName">
<el-input <el-input
v-model="form.organizeName" v-model="form.organizeName"
@ -416,7 +395,7 @@ export default {
province(item) { province(item) {
this.value1 = ""; this.value1 = "";
this.value2 = ""; this.value2 = "";
this.form.areaId = ""; this.form.areaId = item.id;
getSubordinateInfo(item.id).then((res) => { getSubordinateInfo(item.id).then((res) => {
this.citylist = res.data; this.citylist = res.data;
}); });

11
src/views/system/studentInfo/index.vue
View File

@ -55,11 +55,11 @@
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="身份证号" prop="cardNumber"> <el-form-item label="证件编号" prop="cardNumber">
<el-input <el-input
v-model="queryParams.cardNumber" v-model="queryParams.cardNumber"
maxlength="18" maxlength="18"
placeholder="请输入身份证号" placeholder="请输入证件编号"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
@ -211,7 +211,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="身份证号" label="证件编号"
align="center" align="center"
prop="cardNumber" prop="cardNumber"
width="180" width="180"
@ -1015,10 +1015,13 @@ export default {
//验证身份证 //验证身份证
var isCardId = (rule, value, callback) => { var isCardId = (rule, value, callback) => {
if (!value) { if (!value) {
console.log(value);
callback(); callback();
} else { } else {
if (!this.checkSpecialKey(value)) { if (!this.checkSpecialKey(value)) {
callback(new Error("不能含有特殊字符！！")); callback(new Error("不能含有特殊字符！！"));
} else {
callback();
} }
} }
}; };
@ -1031,7 +1034,7 @@ export default {
// /^\d{6}(18|19|20)?\d{2}(0[1-9]|1[0-2])(([0-2][1-9])|10|20|30|31)\d{3}(\d|X|x)$/; // /^\d{6}(18|19|20)?\d{2}(0[1-9]|1[0-2])(([0-2][1-9])|10|20|30|31)\d{3}(\d|X|x)$/;
// const card = reg.test(value); // const card = reg.test(value);
// if (!card) { // if (!card) {
// callback(new Error("身份证号格式有误！")); // callback(new Error("证件编号格式有误！"));
// } else { // } else {
// callback(); // callback();
// } // }

26
src/views/system/testItemScore/index.vue
View File

@ -24,14 +24,6 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="项目名称" prop="itemName">
<el-input
v-model="queryParams.itemName"
placeholder="请输入项目名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="批次名称" prop="batchCode"> <el-form-item label="批次名称" prop="batchCode">
<el-input <el-input
v-model="queryParams.batchName" v-model="queryParams.batchName"
@ -1356,7 +1348,16 @@ export default {
methods: { methods: {
oninputscore2(item) { oninputscore2(item) {
if (item.itemCode == "H001") { if (item.itemCode == "H001") {
console.log(item);
this.Height = item.itemScore; this.Height = item.itemScore;
if (item.itemScore == "") {
this.form.itemScoreList.forEach((e) => {
if (e.itemCode == "W001") {
e.itemFraction = "";
e.itemScore = "";
}
});
}
} }
if (item.itemScore == "") { if (item.itemScore == "") {
this.form.itemScoreList.forEach((e) => { this.form.itemScoreList.forEach((e) => {
@ -1402,7 +1403,16 @@ export default {
}, },
oninputscore(item) { oninputscore(item) {
if (item.itemCode == "H001") { if (item.itemCode == "H001") {
console.log(item);
this.Height = item.itemScore; this.Height = item.itemScore;
if (item.itemScore == "") {
this.form.itemScoreList.forEach((e) => {
if (e.itemCode == "W001") {
e.itemFraction = "";
e.itemScore = "";
}
});
}
} }
if (item.itemScore == "") { if (item.itemScore == "") {
this.form.itemScoreList.forEach((e) => { this.form.itemScoreList.forEach((e) => {

8
src/views/system/testItems/index.vue
View File

@ -37,14 +37,6 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="排序" prop="sorting">
<el-input
v-model="queryParams.sorting"
placeholder="请输入排序"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item> <el-form-item>
<el-button <el-button
type="primary" type="primary"