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'
# 智慧幼儿体质评估与促进系统/开发环境
VUE_APP_BASE_API = 'http://192.168.16.81:8081'
VUE_APP_BASE_API = 'https://kindergarten.xinelu.cn'
#'/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

23
public/index.html
View File

@ -1,12 +1,17 @@
<!DOCTYPE html>
<html>
<head>
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<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="<%= BASE_URL %>favicon.ico">
<title><%= webpackConfig.name %></title>
<!-- <link rel="icon" href="<%= BASE_URL %>favicon.ico"> -->
<!-- <link href="../src/assets/logo/logo.png"> -->
<title>
<%= webpackConfig.name %>
</title>
<!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
<style>
html,
@ -16,6 +21,7 @@
margin: 0px;
padding: 0px;
}
.chromeframe {
margin: 0.2em 0;
background: #ccc;
@ -85,7 +91,6 @@
animation: spin 1.5s linear infinite;
}
@-webkit-keyframes spin {
0% {
-webkit-transform: rotate(0deg);
@ -112,7 +117,6 @@
}
}
#loader-wrapper .loader-section {
position: fixed;
top: 0;
@ -133,7 +137,6 @@
right: 0;
}
.loaded #loader-wrapper .loader-section.section-left {
-webkit-transform: translateX(-100%);
-ms-transform: translateX(-100%);
@ -194,8 +197,9 @@
opacity: 0.5;
}
</style>
</head>
<body>
</head>
<body>
<div id="app">
<div id="loader-wrapper">
<div id="loader"></div>
@ -204,5 +208,6 @@
<div class="load_title">正在加载系统资源，请耐心等待</div>
</div>
</div>
</body>
</body>
</html>

11
src/layout/index.vue
View File

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

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

@ -175,11 +175,7 @@
v-model="form.parentId"
/>
</el-form-item>
<el-form-item
label="所属区域"
prop="areaId"
v-if="List.length != 0 && form.parentId != 0"
>
<el-form-item label="所属区域" prop="areaId">
<el-select
v-model="value"
placeholder="请选择省"
@ -224,23 +220,6 @@
</el-select>
</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-input
v-model="form.organizeName"
@ -416,7 +395,7 @@ export default {
province(item) {
this.value1 = "";
this.value2 = "";
this.form.areaId = "";
this.form.areaId = item.id;
getSubordinateInfo(item.id).then((res) => {
this.citylist = res.data;
});

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

@ -55,11 +55,11 @@
>
</el-date-picker>
</el-form-item>
<el-form-item label="身份证号" prop="cardNumber">
<el-form-item label="证件编号" prop="cardNumber">
<el-input
v-model="queryParams.cardNumber"
maxlength="18"
placeholder="请输入身份证号"
placeholder="请输入证件编号"
clearable
@keyup.enter.native="handleQuery"
/>
@ -211,7 +211,7 @@
</template>
</el-table-column>
<el-table-column
label="身份证号"
label="证件编号"
align="center"
prop="cardNumber"
width="180"
@ -1015,10 +1015,13 @@ export default {
//验证身份证
var isCardId = (rule, value, callback) => {
if (!value) {
console.log(value);
callback();
} else {
if (!this.checkSpecialKey(value)) {
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)$/;
// const card = reg.test(value);
// if (!card) {
// callback(new Error("身份证号格式有误！"));
// callback(new Error("证件编号格式有误！"));
// } else {
// callback();
// }

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

@ -24,14 +24,6 @@
@keyup.enter.native="handleQuery"
/>
</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-input
v-model="queryParams.batchName"
@ -1356,7 +1348,16 @@ export default {
methods: {
oninputscore2(item) {
if (item.itemCode == "H001") {
console.log(item);
this.Height = item.itemScore;
if (item.itemScore == "") {
this.form.itemScoreList.forEach((e) => {
if (e.itemCode == "W001") {
e.itemFraction = "";
e.itemScore = "";
}
});
}
}
if (item.itemScore == "") {
this.form.itemScoreList.forEach((e) => {
@ -1402,7 +1403,16 @@ export default {
},
oninputscore(item) {
if (item.itemCode == "H001") {
console.log(item);
this.Height = item.itemScore;
if (item.itemScore == "") {
this.form.itemScoreList.forEach((e) => {
if (e.itemCode == "W001") {
e.itemFraction = "";
e.itemScore = "";
}
});
}
}
if (item.itemScore == "") {
this.form.itemScoreList.forEach((e) => {

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

@ -37,14 +37,6 @@
@keyup.enter.native="handleQuery"
/>
</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-button
type="primary"