From dba7b13a5941dacd0886f9fedfde6d73b28d479e Mon Sep 17 00:00:00 2001
From: 梁保满 <lbm@liangbaomandeMacBook-Pro.local>
Date: Tue, 21 Mar 2023 16:10:23 +0800
Subject: [PATCH] 添加账号模式，修改教师角色显示问题

---
 src/api/index.js                     |  1 -
 src/views/admin/account/index.vue    | 23 +++++++++++++++--------
 src/views/standard/setUp/teacher.vue | 71 +++++++++++++++++++++++++++++++++++++----------------------------------
 3 files changed, 52 insertions(+), 43 deletions(-)

diff --git a/src/api/index.js b/src/api/index.js
index f83b67f..2746940 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -4,5 +4,4 @@ const modules = modulesFiles.keys().reduce((modules, modulePath) => {
   modules = Object.assign(modules, value.default)
   return modules
 }, {})
-console.log(modules)
 export default modules
diff --git a/src/views/admin/account/index.vue b/src/views/admin/account/index.vue
index d954441..4e56f7e 100644
--- a/src/views/admin/account/index.vue
+++ b/src/views/admin/account/index.vue
@@ -246,14 +246,12 @@
           </el-col>
         </el-form-item>
         <el-form-item label="联系人姓名：" prop="contactPerson">
-          <el-col :span="12">
-            <el-input
-              placeholder="请输入联系人姓名"
-              v-model.trim="formAddCount.contactPerson"
-              maxlength="12"
-            >
-            </el-input>
-          </el-col>
+          <el-input
+            placeholder="请输入联系人姓名"
+            v-model.trim="formAddCount.contactPerson"
+            maxlength="12"
+          >
+          </el-input>
         </el-form-item>
         <el-form-item label="联系人手机号：" prop="contactPhone">
           <el-col :span="12">
@@ -276,6 +274,13 @@
             </el-input>
           </el-col>
         </el-form-item>
+        <el-form-item label="使用模式：">
+          <el-radio-group v-model="formCount.usageMode">
+            <el-radio :label="0">专用模式</el-radio>
+            <el-radio :label="1">共享模式</el-radio>
+            <el-radio :label="2">自由模式 </el-radio>
+          </el-radio-group>
+        </el-form-item>
       </el-form>
       <div class="dialog-footer" slot="footer">
         <el-button @click="saveAddCount">确 定</el-button>
@@ -326,6 +331,7 @@ export default {
         contactPerson: "",
         versionType: "",
         tenantName: "",
+        usageMode: "",
       },
       ruleAddCount: {
         loginName: [{ required: true, message: "请输入账号", trigger: "blur" }],
@@ -352,6 +358,7 @@ export default {
       this.formAddCount.contactPerson = "";
       this.formAddCount.tenantName = "";
       this.formAddCount.versionType = 0;
+      this.formAddCount.usageMode = "";
       this.diaAdd = true;
     },
     saveAddCount() {
diff --git a/src/views/standard/setUp/teacher.vue b/src/views/standard/setUp/teacher.vue
index c7195d8..1ad3687 100644
--- a/src/views/standard/setUp/teacher.vue
+++ b/src/views/standard/setUp/teacher.vue
@@ -321,7 +321,7 @@
               class="sel-t"
               collapse
               clearable
-              placeholder="选择班级"
+              placeholder="选择年级-班级"
               v-model="item.classId"
               :options="gradeClassList"
               :props="{ expandTrigger: 'hover' }"
@@ -332,7 +332,7 @@
               class="sel-t"
               collapse
               clearable
-              placeholder="选择班级-科目"
+              placeholder="选择年级-科目"
               v-model="item.classId"
               :options="classList"
               :props="{ expandTrigger: 'hover' }"
@@ -345,7 +345,7 @@
               clearable
               placeholder="选择年级-科目"
               v-model="item.classId"
-              :options="gradeSubList"
+              :options="gradeList"
               :props="{ expandTrigger: 'hover' }"
             ></el-cascader>
             <i class="el-icon-close" @click="removeRoleList(index)"></i>
@@ -437,7 +437,6 @@ export default {
     await this._QueryDataGrade();
     this._QueryData(1);
     this._RoleList();
-    await this._QuerySubject();
     await this._QueryClass();
   },
   methods: {
@@ -484,6 +483,15 @@ export default {
         obj.teacherGradeList?.length
       );
     },
+    getClassName(id) {
+      let name;
+      this.classList.map((item) => {
+        if (item.value == id) {
+          name = item.label;
+        }
+      });
+      return name;
+    },
     showTeacher(obj) {
       //教师详细数据
       this.showTId = obj.id;
@@ -726,6 +734,12 @@ export default {
               value: item.gradeName,
               label: item.gradeName,
               id: item.grade,
+              children: item.subjectNames?.map((items) => {
+                return {
+                  value: items,
+                  label: items,
+                };
+              }),
             };
           }) || [];
 
@@ -734,46 +748,22 @@ export default {
         this.$message.error(info);
       }
     },
-    async _QuerySubject() {
-      //科目信息
-      const { data, status, info } = await this.$request.subjectList({
-        gradeName:this.query.gradeName
-      });
-      console.log(status);
-      if (status === 0) {
-        this.subjectList = [...data.subjectNames] || [];
-        this.gradeSubList = this.gradeList?.map((item) => {
-          return {
-            value: item.id,
-            label: item.label,
-            children: data.subjectNames.map((sub) => {
-              return {
-                value: sub,
-                label: sub,
-              };
-            }),
-          };
-        });
-      } else {
-        this.$message.error(info);
-      }
-    },
     async _QueryClass() {
       //班级数据
       const { data, status, info } = await this.$request.schoolClassList();
       if (status === 0) {
+        let gradeSubList = {};
+        this.gradeList.map((item) => {
+          gradeSubList[item.value] = [...item.children];
+        });
         this.classList =
           data.list.map((item) => {
             return {
               value: item.id,
               label: item.className,
               grade: item.grade,
-              children: this.subjectList.map((sub) => {
-                return {
-                  value: sub,
-                  label: sub,
-                };
-              }),
+              gradeName: item.gradeName,
+              children: gradeSubList[item.gradeName],
             };
           }) || [];
         this.gradeClassList = formatGradeClass([...data.list]);
@@ -945,6 +935,19 @@ export default {
 }
 .role-list {
   margin-bottom: 10px;
+  position: relative;
+  .sel-p {
+    position: absolute;
+    left: 146px;
+    top: 0;
+    font-size: 13px;
+    color: #606266;
+  }
+  .sel-t {
+    :deep(.el-input__inner) {
+      background: transparent;
+    }
+  }
   .el-icon-close {
     padding: 5px;
     cursor: pointer;
--
libgit2 0.21.4