From 7c0bbffba31db5e15620d1d1555099d989290b36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Mon, 22 Aug 2022 11:43:06 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=B4=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                             |  2 +-
 src/views/system/classconstitution/index.vue |  5 +--
 src/views/system/info/index.vue              | 37 ++++----------------
 src/views/system/survey/index.vue            | 18 +++++-----
 4 files changed, 20 insertions(+), 42 deletions(-)

diff --git a/.env.development b/.env.development
index e352278..4213da2 100644
--- a/.env.development
+++ b/.env.development
@@ -5,7 +5,7 @@ VUE_APP_TITLE = 幼儿园体质检测管理系统
 ENV = 'development'
 
 # 若依管理系统/开发环境
-VUE_APP_BASE_API = 'http://192.168.16.62:8080'
+VUE_APP_BASE_API = 'http://192.168.16.62:8090'
 #'/dev-api'
 
 # 路由懒加载
diff --git a/src/views/system/classconstitution/index.vue b/src/views/system/classconstitution/index.vue
index 48081c4..67fd5bc 100644
--- a/src/views/system/classconstitution/index.vue
+++ b/src/views/system/classconstitution/index.vue
@@ -302,6 +302,7 @@
                   line-height: 30px;
                   border: 1px solid #f0f0f0;
                   background: #f0f0f0;
+                  font-size: 20px;
                 "
               >
                 <div
@@ -382,7 +383,7 @@ import { listClassinfo } from "@/api/system/classinfo";
 import { getRoleInfo, testScoreBatch } from "@/api/system/quality";
 import { ClassList } from "@/api/system/classconstitution";
 export default {
-  name: "comprehensive",
+  name: "classconstitution",
   data() {
     return {
       itemshow: true,
@@ -636,7 +637,7 @@ export default {
             yseries.push(obj);
             names.push(name);
           }
-          console.log(yseries)
+          console.log(yseries);
 
           option = {
             tooltip: {
diff --git a/src/views/system/info/index.vue b/src/views/system/info/index.vue
index 97f1f91..0e2163c 100644
--- a/src/views/system/info/index.vue
+++ b/src/views/system/info/index.vue
@@ -154,6 +154,7 @@
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['system:area:remove']"
+            v-if="scope.row.id != 1"
             >删除</el-button
           >
         </template>
@@ -163,37 +164,15 @@
     <!-- 添加或修改区域管理对话框 -->
 
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <!-- <el-form ref="form" :model="form" :rules="rules" label-width="110px">
-        <el-form-item label="所属上级区域" prop="areaId">
+      <el-form ref="form" :model="form" :rules="rules" label-width="110px">
+        <el-form-item label="所属上级组织" prop="parentId" v-if="form.id != 1">
           <treeselect
-            :normalizer="normalizer"
-            :options="areaList"
-            placeholder="请选择所属上级区域"
-            v-model="form.areaId"
+            :normalizer="normalizer2"
+            :options="List"
+            placeholder="请选择所属组织"
+            v-model="form.parentId"
           />
         </el-form-item>
-
-        <el-form-item label="区域名称" prop="name">
-          <el-input v-model="form.name" placeholder="请输入区域名称" />
-        </el-form-item>
-        <el-form-item label="区域编码" prop="code">
-          <el-input v-model.number="form.code" placeholder="请输入区域编码" />
-        </el-form-item>
-        <el-form-item label="排序" prop="sort">
-          <el-input v-model.number="form.sort" placeholder="请输入排序" />
-        </el-form-item>
-      </el-form> -->
-
-      <el-form-item label="所属上级组织" prop="parentId" v-if="form.id != 1">
-        <treeselect
-          :normalizer="normalizer2"
-          :options="List"
-          placeholder="请选择所属组织"
-          v-model="form.parentId"
-        />
-      </el-form-item>
-
-      <el-form ref="form" :model="form" :rules="rules" label-width="110px">
         <el-form-item label="所属区域" prop="areaId">
           <treeselect
             :normalizer="normalizer"
@@ -246,11 +225,9 @@ export default {
       // 验证手机号的正则表达式
       const regMobile =
         /^(0|86|17951)?(13[0-9]|15[012356789]|17[678]|18[0-9]|14[57])[0-9]{8}$/;
-
       if (regMobile.test(value)) {
         return cb();
       }
-
       cb(new Error("请输入合法的手机号"));
     };
     return {
diff --git a/src/views/system/survey/index.vue b/src/views/system/survey/index.vue
index 1cef83a..425d6f1 100644
--- a/src/views/system/survey/index.vue
+++ b/src/views/system/survey/index.vue
@@ -294,20 +294,20 @@ export default {
       studentlist: [],
       //查询传值
       classqueryParams: {
-        kindergartenId: "",
-        batchCode: "",
+        // kindergartenId: "",
+        // batchCode: "",
         pageNum: 1,
         pageSize: 10,
-        // kindergartenId: "12",
-        // batchCode: "PC202208030005",
+        kindergartenId: "12",
+        batchCode: "PC202208030005",
       },
       studentlistqueryParams: {
-        kindergartenId: "",
-        batchCode: "",
+        // kindergartenId: "",
+        // batchCode: "",
         pageNum: 1,
         pageSize: 10,
-        // kindergartenId: "1",
-        // batchCode: "PC202208030005",
+        kindergartenId: "1",
+        batchCode: "PC202208030005",
       },
       LARGECLASS: "LARGE_CLASS",
       MIDDLECLASS: "MIDDLE_CLASS",
@@ -321,7 +321,7 @@ export default {
   created() {
     this.getList();
     this.StudentListinfo();
-    // this.ClassListinfo();
+    this.ClassListinfo();
   },
   methods: {
     ClassListinfo() {