diff --git a/src/api/system/testItems.js b/src/api/system/testItems.js index 955fe3b..0c74e2d 100644 --- a/src/api/system/testItems.js +++ b/src/api/system/testItems.js @@ -8,6 +8,13 @@ export function listTestItems(query) { params: query }) } +//查看分类 +export function getTestCategoryItemInfo(itemId) { + return request({ + url: `/system/testItems/getTestCategoryItemInfo/?itemId=${itemId}`, + method: 'get' + }) +} // 查询测试项目详细 export function getTestItems(id) { diff --git a/src/views/system/action/index.vue b/src/views/system/action/index.vue index c8cd09c..333630d 100644 --- a/src/views/system/action/index.vue +++ b/src/views/system/action/index.vue @@ -78,7 +78,7 @@ align="center" > - + diff --git a/src/views/system/classconstitution/index.vue b/src/views/system/classconstitution/index.vue index 7ef4729..a11a0b7 100644 --- a/src/views/system/classconstitution/index.vue +++ b/src/views/system/classconstitution/index.vue @@ -305,9 +305,7 @@ export default { classId: "", // batchCode: "PC202208030005", // kindergartenId: "18", - // classId: "2", - pageNum: 1, - pageSize: 10, + // classId: "2" }, categoryTableNameList: [], categoryAgeFractionList: [], diff --git a/src/views/system/comprehensive/index.vue b/src/views/system/comprehensive/index.vue index 263823d..191b653 100644 --- a/src/views/system/comprehensive/index.vue +++ b/src/views/system/comprehensive/index.vue @@ -53,7 +53,7 @@ 性别:{{ sythesizestudent.studentSex == "MALE" ? "男" : "女" }}
- 年龄:{{ sythesizestudent.studentAge }} + 年龄:{{ sythesizestudent.studentAge }}岁
民族:{{ sythesizestudent.nationName }} diff --git a/src/views/system/personalecharts/index.vue b/src/views/system/personalecharts/index.vue index f0c6de9..125024d 100644 --- a/src/views/system/personalecharts/index.vue +++ b/src/views/system/personalecharts/index.vue @@ -32,7 +32,7 @@ 性别:{{ sythesizestudent.studentSex == "MALE" ? "男" : "女" }}
- 年龄:{{ sythesizestudent.studentAge }} + 年龄:{{ sythesizestudent.studentAge }}岁
民族:{{ sythesizestudent.nationName }} diff --git a/src/views/system/survey/index.vue b/src/views/system/survey/index.vue index 352c141..e9ee557 100644 --- a/src/views/system/survey/index.vue +++ b/src/views/system/survey/index.vue @@ -192,8 +192,6 @@ export default { studentlistqueryParams: { kindergartenId: "", batchCode: "", - pageNum: 1, - pageSize: 10, // kindergartenId: "2", // batchCode: "PC202208260011", }, diff --git a/src/views/system/testItems/index.vue b/src/views/system/testItems/index.vue index 4bd5fa5..bf1f442 100644 --- a/src/views/system/testItems/index.vue +++ b/src/views/system/testItems/index.vue @@ -8,7 +8,7 @@ v-show="showSearch" label-width="68px" > - - + --> - - - + + + - + - -
- +
@@ -261,7 +267,7 @@ v-model.number="form.itemContent" placeholder="项目内容" maxlength="200" - style="width: 500px" + style="width: 600px" />
- - - - + + + + + + + + + + @@ -471,6 +502,7 @@ import { delTestItems, addTestItems, updateTestItems, + getTestCategoryItemInfo, } from "@/api/system/testItems"; import { tKindergartenInfo } from "@/api/system/kindergartenInfo"; import { listItemCategory } from "@/api/system/itemCategory"; @@ -721,7 +753,6 @@ export default { // } // }); }; - let minScore = (rule, value, callback) => { if (!value) { callback(); @@ -739,14 +770,10 @@ export default { callback(); } }; - const validateVin = (rule, value, callback) => { const containAlpha = /[a-zA-Z]/; //含有字母 - const containLowerCase = /[a-z]/; //匹配小写字母 value = value.slice(0, 1); - console.log(value); - if (!value) { callback(new Error("不能为空")); } else if (!containAlpha.test(value)) { @@ -811,7 +838,7 @@ export default { queryParams: { pageNum: 1, pageSize: 10, - itemCategoryId: null, + testCategoryItemList: null, itemName: null, itemCode: null, }, @@ -877,7 +904,7 @@ export default { itemContent: [ { required: true, message: "项目内容不能为空", trigger: "blur" }, ], - itemCategoryId: [ + testCategoryItemList: [ { required: true, message: "请选择项目所属分类", trigger: "blur" }, ], itemCode: [ @@ -914,6 +941,8 @@ export default { }, ], }, + categorynamelist: [], + itemtypeopen: false, }; }, created() { @@ -1032,12 +1061,16 @@ export default { }, addInput() { console.log(this.form); - this.form.itemLevelList.push({ - levelName: "", - levelMinScore: "", - levelMaxScore: "", - standardFlag: "", - }); + if (this.form.itemLevelList.length >= 5) { + this.$message.error("最多5个级别"); + } else { + this.form.itemLevelList.push({ + levelName: "", + levelMinScore: "", + levelMaxScore: "", + standardFlag: "", + }); + } }, /** 查询测试项目列表 */ getList() { @@ -1049,8 +1082,6 @@ export default { tKindergartenInfo(this.itemResultType).then((res) => { // console.log(res); this.itemResultTypelist = res.data; - console.log(this.itemResultTypelist); - this.ResultType1 = this.itemResultTypelist[0]; this.ResultType2 = this.itemResultTypelist[1]; // console.log(this.ResultType1); @@ -1061,7 +1092,6 @@ export default { }); tKindergartenInfo(this.standardType).then((res) => { this.standardTypelist = res.data; - console.log(this.standardTypelist); }); listTestItems(this.queryParams).then((response) => { this.testItemsList = response.rows; @@ -1082,6 +1112,7 @@ export default { itemName: "", itemCode: null, itemContent: "", + testCategoryItemList: null, measureUnit: "", standardType: null, largeStandardScore: "", @@ -1126,6 +1157,15 @@ export default { this.open = true; this.title = "添加测试项目"; }, + //查看所属分类 + looktype(row) { + this.categorynamelist = []; + getTestCategoryItemInfo(row.id).then((res) => { + this.categorynamelist = res.data; + this.itemtypeopen = true; + console.log(this.categorynamelist); + }); + }, /** 修改按钮操作 */ handleUpdate(row) { this.reset(); @@ -1206,3 +1246,17 @@ export default { }, }; + \ No newline at end of file