This commit is contained in:
曹辉 2022-09-30 09:09:29 +08:00
parent e8ae9f0378
commit e621393740
6 changed files with 68 additions and 29 deletions

View File

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

View File

@ -1,3 +1,3 @@
var baseurl = "http://192.168.16.62:8080";
var baseurl = "http://192.168.16.81:8081";
export default baseurl

View File

@ -56,12 +56,27 @@
<el-button
@click="kindergartenshow = true"
v-if="kindergartenName == '请选择幼儿园'"
style="width: 200px; text-align: left; height: 32px; color: #c0c4cc"
style="
width: 200px;
text-align: left;
height: 32px;
color: #c0c4cc;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
"
>{{ kindergartenName }}</el-button
>
<el-button
@click="kindergartenshow = true"
style="width: 200px; text-align: left; height: 32px"
style="
width: 200px;
text-align: left;
height: 32px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
"
v-else
>{{ kindergartenName }}</el-button
>
@ -70,14 +85,29 @@
<el-form-item label="所属班级" prop="categoryName" label-width="80px">
<el-button
@click="classshowclick"
style="width: 200px; text-align: left; height: 32px; color: #c0c4cc"
style="
width: 200px;
text-align: left;
height: 32px;
color: #c0c4cc;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
"
v-if="className == '请选择班级'"
>{{ className }}</el-button
>
<el-button
@click="classshowclick"
style="width: 200px; text-align: left; height: 32px"
style="
width: 200px;
text-align: left;
height: 32px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
"
v-else
>{{ className }}</el-button
>

View File

@ -135,14 +135,14 @@
text-align: center;
justify-content: center;
color: black;
font-weight:550;
font-weight: 550;
"
>
<div
style="
width: 120px;
border: 1px solid #f0f0f0;
background: #F5F7FA;
background: #f5f7fa;
"
>
年龄
@ -151,7 +151,7 @@
style="
width: 120px;
border: 1px solid #f0f0f0;
background: #F5F7FA;
background: #f5f7fa;
"
>
平均总分
@ -162,7 +162,7 @@
text-align: center;
line-height: 30px;
border: 1px solid #f0f0f0;
background: #F5F7FA;
background: #f5f7fa;
"
>
{{ item.parentName }}
@ -172,7 +172,7 @@
display: flex;
line-height: 30px;
border: 1px solid #f0f0f0;
background: #F5F7FA;
background: #f5f7fa;
font-size: 12px;
"
>
@ -197,12 +197,7 @@
v-for="item in categoryScoreList"
:key="item.prentId"
>
<div
style="
width: 120px;
border: 1px solid #f0f0f0;
"
>
<div style="width: 120px; border: 1px solid #f0f0f0">
{{ item.className }}
</div>
<div style="width: 120px; border: 1px solid #f0f0f0">
@ -345,8 +340,13 @@ export default {
var name = "";
var names = [];
var ydata = [];
if (res.data == [] || !res.data) {
if (res.code == 500) {
this.itemshow2 = true;
this.itemshow = false;
} else if (res.data == []) {
this.itemshow2 = true;
this.itemshow = false;
} else if (!res.data) {
this.itemshow2 = true;
this.itemshow = false;
} else {

View File

@ -546,12 +546,6 @@ export default {
});
},
getList() {
this.loading = true;
tKindergartenInfo(this.kindergartenType).then((res) => {
this.type = res.data[0];
this.type2 = res.data[1];
});
//list
listKindergartenInfo(this.kqueryParams).then((response) => {
this.kindergartenList = response.rows;
@ -598,7 +592,7 @@ export default {
pageNum: 1,
pageSize: 10,
kindergartenId: null,
kindergartenName:null,
kindergartenName: null,
batchCode: null,
reportCode: null,
reportName: null,

View File

@ -176,12 +176,27 @@
<el-button
@click="kindergartenshow = true"
v-if="kindergartenName == '请选择幼儿园'"
style="width: 200px; text-align: left; height: 32px; color: #c0c4cc"
style="
width: 200px;
text-align: left;
height: 32px;
color: #c0c4cc;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
"
>{{ kindergartenName }}</el-button
>
<el-button
@click="kindergartenshow = true"
style="width: 200px; text-align: left; height: 32px"
style="
width: 200px;
text-align: left;
height: 32px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
"
v-else
>{{ kindergartenName }}</el-button
>
@ -385,7 +400,7 @@
:total="total1"
:page.sync="kqueryParams.pageNum"
:limit.sync="kqueryParams.pageSize"
@pagination="getList"
@pagination="listKindergartenInfoetList"
/>
</el-dialog>