From e65492366fd5db5266dd67f45ca96b21979341d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com> Date: Fri, 4 Nov 2022 10:17:12 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/system/testItems.js | 7 +++ src/views/system/testItems/index.vue | 87 ++++++++++++++++++++-------- 2 files changed, 71 insertions(+), 23 deletions(-) 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/testItems/index.vue b/src/views/system/testItems/index.vue index 4bd5fa5..a2c0bfb 100644 --- a/src/views/system/testItems/index.vue +++ b/src/views/system/testItems/index.vue @@ -50,7 +50,6 @@ > - - - + + + @@ -272,7 +273,6 @@ /> --> - - - -
确 定 取 消
+ + + + + + + + +
+ 关闭 +
+ @@ -471,6 +494,7 @@ import { delTestItems, addTestItems, updateTestItems, + getTestCategoryItemInfo, } from "@/api/system/testItems"; import { tKindergartenInfo } from "@/api/system/kindergartenInfo"; import { listItemCategory } from "@/api/system/itemCategory"; @@ -721,7 +745,6 @@ export default { // } // }); }; - let minScore = (rule, value, callback) => { if (!value) { callback(); @@ -739,14 +762,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)) { @@ -914,6 +933,8 @@ export default { }, ], }, + categorynamelist: [], + itemtypeopen: false, }; }, created() { @@ -1049,8 +1070,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 +1080,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; @@ -1126,6 +1144,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 +1233,17 @@ export default { }, }; + \ No newline at end of file From 318711edcd8887a3cfbb2b2c36198a291dda2eea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com> Date: Fri, 4 Nov 2022 10:30:02 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/testItems/index.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/system/testItems/index.vue b/src/views/system/testItems/index.vue index a2c0bfb..b6ac87d 100644 --- a/src/views/system/testItems/index.vue +++ b/src/views/system/testItems/index.vue @@ -201,7 +201,7 @@ :inline="true" >
- + Date: Fri, 4 Nov 2022 10:30:47 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/testItems/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/system/testItems/index.vue b/src/views/system/testItems/index.vue index b6ac87d..5e87671 100644 --- a/src/views/system/testItems/index.vue +++ b/src/views/system/testItems/index.vue @@ -1100,6 +1100,7 @@ export default { itemName: "", itemCode: null, itemContent: "", + testCategoryItemList:null, measureUnit: "", standardType: null, largeStandardScore: "", From f818c52ae3fc89a5ed447170d942bcdc476f491d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com> Date: Fri, 4 Nov 2022 16:39:47 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/classconstitution/index.vue | 4 +--- src/views/system/comprehensive/index.vue | 2 +- src/views/system/survey/index.vue | 2 -- 3 files changed, 2 insertions(+), 6 deletions(-) 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/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", }, From 59027f9213ac261b3eac193d3c2fc327d656d549 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com> Date: Fri, 4 Nov 2022 17:25:34 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/action/index.vue | 2 +- src/views/system/personalecharts/index.vue | 2 +- src/views/system/testItems/index.vue | 52 +++++++++++++--------- 3 files changed, 34 insertions(+), 22 deletions(-) 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/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/testItems/index.vue b/src/views/system/testItems/index.vue index 5e87671..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" > - - + --> --> - +