首页大屏开发-修改2超级管理员-管理员跳转

src/components/login/Login.vue

@@ -8,33 +8,20 @@
             <p v-if="systemVersion != 'public'">
               <span>类型</span>
               <el-select v-model="userType" placeholder="请选择用户类型" @change="userTypeChange">
-                <el-option
-                  v-for="item in roleList[systemVersion]"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                />
+                <el-option v-for="item in roleList[systemVersion]" :key="item.value" :label="item.label"
+                  :value="item.value" />
               </el-select>
             </p>
             <p v-if="showInstitutionNo">
               <span>学校编号</span>
-              <el-input
-                v-model="institutionNo"
-                placeholder="请输入学校编号"
-              />
+              <el-input v-model="institutionNo" placeholder="请输入学校编号" />
             </p>
             <p>
-              <span>账号</span
-              ><el-input v-model="userName" placeholder="请输入账号"></el-input>
+              <span>账号</span><el-input v-model="userName" placeholder="请输入账号"></el-input>
             </p>
             <p>
               <span>密码</span>
-              <el-input
-                v-model="password"
-                @keyup.enter.native="loginHandle"
-                placeholder="请输入密码"
-                show-password
-              />
+              <el-input v-model="password" @keyup.enter.native="loginHandle" placeholder="请输入密码" show-password />
             </p>
             <div class="goRegister">
               <span @click="registShow = true">没有账号去注册？</span>
@@ -55,13 +42,9 @@
       <div>
         <ul class="record">
           <li v-if="$store.state.systemVersion != 'lan'">
-            <a
-              target="_blank"
-              href="http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=11011402011379"
-              ><img src="../../assets/beian.png" /><span class="ml10"
-                >京公网安备 11011402011379号
-              </span></a
-            >
+            <a target="_blank" href="http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=11011402011379"><img
+                src="../../assets/beian.png" /><span class="ml10">京公网安备 11011402011379号
+              </span></a>
           </li>
           <li v-if="$store.state.systemVersion != 'lan'">
             <a href="https://beian.miit.gov.cn">京ICP备20000146号-2</a>
@@ -73,35 +56,17 @@
       </div>
     </div>
     <!-- 用户注册弹窗 -->
-    <el-dialog
-      v-show="registShow"
-      title="用户注册"
-      :visible.sync="registShow"
-      width="65%"
-      @closed="closeDialog"
-      @open='openDialog'
-      :close-on-click-modal="false"
-    >
+    <el-dialog v-show="registShow" title="用户注册" :visible.sync="registShow" width="65%" @closed="closeDialog"
+      @open='openDialog' :close-on-click-modal="false">
       <div class="grid-content bg-purple-dark">
         <!-- 创建表单进行表单校验 -->
-        <el-form
-          :model="userInfo"
-          :rules="rules"
-          ref="userInfo"
-          label-width="100px"
-          class="demo-ruleForm"
-        >
+        <el-form :model="userInfo" :rules="rules" ref="userInfo" label-width="100px" class="demo-ruleForm">
           <el-row>
             <el-col :span="12">
               <el-form-item label="账号" prop="phone">
                 <!-- onkeyup="this.value=this.value.replace(/[^a-zA-Z\d]/g,'')"  -->
                 <!--onkeyup="value=value.replace(/[^\w\.\/]/ig,'')"-->
-                <el-input
-                  min="3"
-                  max="18"
-                  v-model="userInfo.phone"
-                  placeholder="请输入账号"
-                >
+                <el-input min="3" max="18" v-model="userInfo.phone" placeholder="请输入账号">
                 </el-input>
               </el-form-item>
             </el-col>
@@ -117,29 +82,18 @@
           <el-row>
             <el-col :span="12">
               <el-form-item label="生日" prop="birthday">
-                <date-select
-                  @dateChange="dateChange"
-
-                  ref="dateSelect"
-                ></date-select>
+                <date-select @dateChange="dateChange" ref="dateSelect"></date-select>
               </el-form-item>
             </el-col>
             <el-col :span="12" v-if="systemVersion != 'lan'">
               <el-form-item label="职业" prop="profession">
-                <el-input
-                  v-model="userInfo.profession"
-                  placeholder="请输入职业"
-                >
+                <el-input v-model="userInfo.profession" placeholder="请输入职业">
                 </el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12" v-else>
               <el-form-item label="确认密码" prop="passwordCheck">
-                <el-input
-                  type="password"
-                  v-model="userInfo.passwordCheck"
-                  planceholder="请输入确认密码"
-                >
+                <el-input type="password" v-model="userInfo.passwordCheck" planceholder="请输入确认密码">
                 </el-input>
               </el-form-item>
             </el-col>
@@ -147,21 +101,13 @@
           <el-row>
             <el-col :span="12">
               <el-form-item label="密码" prop="password">
-                <el-input
-                  type="password"
-                  v-model="userInfo.password"
-                  planceholder="请输入密码"
-                >
+                <el-input type="password" v-model="userInfo.password" planceholder="请输入密码">
                 </el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12" v-if="systemVersion != 'lan'">
               <el-form-item label="确认密码" prop="passwordCheck">
-                <el-input
-                  type="password"
-                  v-model="userInfo.passwordCheck"
-                  planceholder="请输入确认密码"
-                >
+                <el-input type="password" v-model="userInfo.passwordCheck" planceholder="请输入确认密码">
                 </el-input>
               </el-form-item>
             </el-col>
@@ -175,28 +121,15 @@
             </el-col>
             <el-col :span="12" v-if="systemVersion == 'public'">
               <el-form-item label="短信验证码" prop="vCode">
-                <el-input
-                  style="width: 50%"
-                  v-model="userInfo.vCode"
-                  placeholder="请输入短信验证码"
-                >
+                <el-input style="width: 50%" v-model="userInfo.vCode" placeholder="请输入短信验证码">
                 </el-input>
-                <el-button
-                  type="primary"
-                  plain
-                  :disabled="disabled"
-                  style="width: 40%; margin-left: 5px"
-                  @click="getVcode(userInfo.phone)"
-                  >{{ vText }}</el-button
-                >
+                <el-button type="primary" plain :disabled="disabled" style="width: 40%; margin-left: 5px"
+                  @click="getVcode(userInfo.phone)">{{ vText }}</el-button>
               </el-form-item>
             </el-col>
             <el-col :span="12" v-if="systemVersion == 'institution'">
               <el-form-item label="学校编号" prop="institutionNo">
-                <el-input
-                  v-model="userInfo.institutionNo"
-                  placeholder="请输入学校编号"
-                >
+                <el-input v-model="userInfo.institutionNo" placeholder="请输入学校编号">
                 </el-input>
               </el-form-item>
             </el-col>
@@ -211,18 +144,11 @@
                     <el-radio v-model="userInfo.roleType" label="1">普通用户</el-radio>
                     <el-radio v-model="userInfo.roleType" label="2">管理员</el-radio>
                   </div>
-                  <el-button
-                    type="primary"
-                    v-on:click="registClick('userInfo')"
-                    size="big"
-                    style="margin-bottom: 2rem; margin-top: 20px"
-                  >
+                  <el-button type="primary" v-on:click="registClick('userInfo')" size="big"
+                    style="margin-bottom: 2rem; margin-top: 20px">
                     注册
                   </el-button>
-                  <p
-                    style="font-size: 10px; cursor: pointer; font-color: red"
-                    @click="registAndLoginControl()"
-                  >
+                  <p style="font-size: 10px; cursor: pointer; font-color: red" @click="registAndLoginControl()">
                     已经有账号去登录
                   </p>
                 </div>
@@ -233,51 +159,21 @@
       </div>
     </el-dialog>
     <!-- 忘记密码弹窗 -->
-    <el-dialog
-      :close-on-click-modal="false"
-      title="忘记密码"
-      :visible.sync="forgetPsd"
-      width="30%"
-    >
-      <el-form
-        :model="forgetForm"
-        label-position="right"
-        label-width="100px"
-        :rules="rules"
-      >
+    <el-dialog :close-on-click-modal="false" title="忘记密码" :visible.sync="forgetPsd" width="30%">
+      <el-form :model="forgetForm" label-position="right" label-width="100px" :rules="rules">
         <el-form-item label="账号" prop="phone">
-          <el-input
-            style="width: 60%"
-            v-model="forgetForm.tel"
-            placeholder="请输入账号"
-            autocomplete="off"
-          ></el-input>
+          <el-input style="width: 60%" v-model="forgetForm.tel" placeholder="请输入账号" autocomplete="off"></el-input>
         </el-form-item>
         <el-form-item label="短信验证码" prop="vCode">
-          <el-input
-            style="width: 60%"
-            v-model="forgetForm.vCode"
-            placeholder="请输入短信验证码"
-          >
+          <el-input style="width: 60%" v-model="forgetForm.vCode" placeholder="请输入短信验证码">
           </el-input>
 
-          <el-button
-            type="primary"
-            plain
-            :disabled="disabled"
-            style="width: 26%; margin-left: 5px"
-            @click="getVcode(forgetForm.tel)"
-            >{{ vText }}</el-button
-          >
+          <el-button type="primary" plain :disabled="disabled" style="width: 26%; margin-left: 5px"
+            @click="getVcode(forgetForm.tel)">{{ vText }}</el-button>
         </el-form-item>
         <el-form-item label="新密码" label-width="100px" prop="password">
-          <el-input
-            style="width: 60%"
-            type="password"
-            v-model="forgetForm.newPsd"
-            placeholder="请输入新密码"
-            autocomplete="off"
-          ></el-input>
+          <el-input style="width: 60%" type="password" v-model="forgetForm.newPsd" placeholder="请输入新密码"
+            autocomplete="off"></el-input>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -323,9 +219,9 @@ export default {
         } else {
           if (3 > value.length || value.length > 18) {
             callback(new Error("长度需在3~18位之间"));
-          }else if(/[^\w\.V]/ig.test(value)){
-              callback(new Error("请不要输入中文和空格"));
-          }else {
+          } else if (/[^\w\.V]/ig.test(value)) {
+            callback(new Error("请不要输入中文和空格"));
+          } else {
             callback();
           }
         }
@@ -376,15 +272,15 @@ export default {
       }
     };
     var checkBirthday = (rule, value, callback) => {
-        if (value == "") {
-            callback(new Error("生日不能为空"));
+      if (value == "") {
+        callback(new Error("生日不能为空"));
+      } else {
+        if (value.split("-")[0] == 'null' || value.split("-")[1] == 'null' || value.split("-")[2] == 'null') {
+          callback(new Error("请补全生日"));
         } else {
-            if (value.split("-")[0] == 'null' || value.split("-")[1] == 'null' || value.split("-")[2] == 'null') {
-                callback(new Error("请补全生日"));
-            } else {
-                callback();
-            }
+          callback();
         }
+      }
     };
     return {
       systemVersion: systemVersion,
@@ -506,7 +402,7 @@ export default {
       showInstitutionNo: true
     };
   },
-  created() {},
+  created() { },
   methods: {
     ...mapActions({
       setTagActive: "setTagActive",
@@ -586,15 +482,24 @@ export default {
             // } else {
 
             // }
-              this.$router.push({ name: "MainTable" });
+            this.$router.push({ name: "MainTable" });
           } else if (userType == 2) {
             this.$router.push({
-              path: "ContainerSys",
+              path: "ContainerSys/AdminHomeS",
               query: { phone: this.userName },
             });
-          } else if (userType == 4 || userType == 3) {
+          } else if (userType == 3) {
+            this.$router.push({
+              path: "ContainerSys/AdminHomeS",
+              query: {
+                phone: this.userName,
+                userType: userType,
+                institutionNo: this.institutionNo,
+              },
+            });
+          }else if (userType == 4) {
             this.$router.push({
-              path: "ContainerSys",
+              path: "ContainerSys/AdminHome",
               query: {
                 phone: this.userName,
                 userType: userType,
@@ -678,7 +583,7 @@ export default {
       this.$refs.dateSelect.setDateNull();
       this.$refs["userInfo"].resetFields();
     },
-    openDialog(){
+    openDialog() {
       this.$refs["userInfo"].resetFields();
     },
 
@@ -730,7 +635,8 @@ export default {
   background-image: url('~@/assets/bg-login1.png');
   background-size: 100% 100%;
   background-repeat: no-repeat;
-  background-position: center; /* 可选，让图片居中对齐 */
+  background-position: center;
+  /* 可选，让图片居中对齐 */
 }
 
 .footer {
@@ -757,6 +663,7 @@ export default {
 .footer .record span {
   vertical-align: middle;
 }
+
 .header {
   width: 100%;
   height: 70px;
@@ -787,7 +694,8 @@ export default {
   background-image: url('~@/assets/icon-logo.png');
   background-size: 100% 100%;
   background-repeat: no-repeat;
-  background-position: center; /* 可选，让图片居中对齐 */
+  background-position: center;
+  /* 可选，让图片居中对齐 */
 }
 
 .login_right {
@@ -801,7 +709,8 @@ export default {
   background-image: url('~@/assets/bg-login-outline.png');
   background-size: 100% 100%;
   background-repeat: no-repeat;
-  background-position: center; /* 可选，让图片居中对齐 */
+  background-position: center;
+  /* 可选，让图片居中对齐 */
 }
 
 .login_box {
@@ -899,8 +808,7 @@ export default {
 
 .all-height {
   height: 100vh;
-  background: #f5f5f5 url(../../assets/index/psychic_camera_logo.png) no-repeat
-    10vw 24vh;
+  background: #f5f5f5 url(../../assets/index/psychic_camera_logo.png) no-repeat 10vw 24vh;
   background-size: 46% auto;
 }
 

src/components/manage/main/UserGroupManagement.vue

@@ -23,53 +23,26 @@
                 </div>-->
       </div>
       <div>
-        <el-button
-          type="primary"
-          icon="el-icon-plus"
-          @click="dialogVisible = true"
-        >
+        <el-button type="primary" icon="el-icon-plus" @click="dialogVisibleopen">
           添加年级
         </el-button>
       </div>
     </div>
     <!--记录展示start-->
-    <el-table
-      :data="tableData"
-      border
-      style="width: 100%; margin-top: 20px"
-      class="table-padding"
-    >
-      <el-table-column
-        prop="groupName"
-        label="用户组名称"
-        min-width="200"
-        align="center"
-      >
+    <el-table :data="tableData" border style="width: 100%; margin-top: 20px" class="table-padding">
+      <el-table-column prop="groupName" label="用户组名称" min-width="200" align="center">
       </el-table-column>
       <el-table-column label="操作" min-width="500" align="center">
         <template slot-scope="scope">
-          <el-button
-            v-if="scope.row.groupName != '默认年级'"
-            type="danger"
-            size="small"
-            @click="deleteGroup(scope.row)"
-          >
+          <el-button v-if="scope.row.groupName != '默认年级'" type="danger" size="small" @click="deleteGroup(scope.row)">
             删除
           </el-button>
           <!-- <el-button type="text" @click="open">点击打开 Message Box</el-button>-->
-          <el-button
-            v-if="scope.row.groupName != '默认年级'"
-            type="primary"
-            size="small"
-            @click="updateGroupName(scope.row)"
-          >
+          <el-button v-if="scope.row.groupName != '默认年级'" type="primary" size="small"
+            @click="updateGroupName(scope.row)">
             更新组名
           </el-button>
-          <el-button
-            type="primary"
-            size="small"
-            @click="getGroupUserList(scope.row)"
-          >
+          <el-button type="primary" size="small" @click="getGroupUserList(scope.row)">
             查看成员
           </el-button>
           <el-button type="primary" size="small" @click="goGroupAuth(scope.row)">
@@ -80,13 +53,14 @@
     </el-table>
     <!--记录展示end-->
 
-    <el-dialog
-      title="添加年级"
-      :visible.sync="dialogVisible"
-      width="680px"
-      :before-close="handleClose"
-    >
-
+    <el-dialog title="添加年级" :visible.sync="dialogVisible" width="680px" :before-close="handleClose">
+      <!-- <el-row>
+        <span style="margin-left: 15px;">请选择角色：</span>
+        <el-select v-model="groupUser" multiple placeholder="请选择">
+          <el-option v-for="item in optionsgroupUserList" :key="item.id" :label="item.petName" :value="item.id">
+          </el-option>
+        </el-select>
+      </el-row> -->
       <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">全选</el-checkbox>
       <div style="margin: 15px 0;"></div>
       <el-checkbox-group v-model="checkedGrades" @change="handleCheckedCitiesChange">
@@ -113,11 +87,13 @@ export default {
       institutionNo: "", //学校编码
       tableData: [], //年级数据
       ids: [],
-
+      groupUser: [],
       isIndeterminate: false,
       checkAll: false,
       gradeOptions: ['一年级', '二年级', '三年级', '四年级', '五年级', '六年级', '七年级', '八年级', '九年级', '高一年级', '高二年级', '高三年级'],
       checkedGrades: [],
+      vser: '',
+      optionsgroupUserList: [],
       dialogVisible: false,
       loading: false
     };
@@ -126,9 +102,19 @@ export default {
     this.institutionNo = sessionStorage.getItem(
       "f7a42fe7211f98ac7a60a285ac3a9527"
     )
+    this.vser = sessionStorage.getItem(
+      "f7a42fe7211f98ac7a60a285ac3a9529"
+    );
     this.getData()
+    this.getDatas()
   },
   methods: {
+    // 打开添加年级模态框
+    dialogVisibleopen() {
+      this.dialogVisible = true
+      console.log(this.vser, '========================>this.vser');
+      this.groupUser = [this.vser]
+    },
     getData() {
       this.$http.get(
         "/group/find?institutionNo=" + this.institutionNo,
@@ -139,9 +125,32 @@ export default {
         }
       )
     },
+    getDatas() {
+      this.searchKeyLin = this.searchKey;
+      this.$http.get(
+        "/institution/getInAdminByInNo?searchKey=" +
+        this.searchKey +
+        "&pageNum=" +
+        1 +
+        "&institutionNo=" +
+        this.institutionNo +
+        "&pageSize=" +
+        30 +
+        "",
+        {},
+        (response) => {
+          this.optionsgroupUserList = response.data.institutionUserList
+          // this.total = response.data.allNum;
+          // this.tableData = response.data.institutionUserList;
+          console.log(response, '==============================>response');
+
+        }
+      );
+    },
 
     handleClose() {
       this.checkedGrades = []
+      this.groupUser = []
       this.isIndeterminate = false
       this.checkAll = false
       this.dialogVisible = false