Merge branch 'develop5.0-tmd' of http://52.130.252.100:10000/TEAMMODEL/TEAMModelOS into develop5.0-tmd

TEAMModeBI/ClientApp/src/api/index.js

@@ -6,7 +6,7 @@ export default {
     },
     //发送短信验证码
     Phonepin(data) {
-        return post('/common/login/send-sms', data)
+        return post('/common/biservers/send-sms', data)
     },
     //验证手机号和验证
     verifyCode(data) {

TEAMModeBI/ClientApp/src/view/bindPhone.vue

@@ -27,68 +27,68 @@
     </el-dialog>
 </template>
 <script>
-import { reactive, ref, getCurrentInstance, watch } from "vue";
+import { reactive, ref, getCurrentInstance, watch } from 'vue'
 // import { Phonepin, verifyCode, bindUserid } from "@/api/index.js";
-import { ElMessage } from "element-plus";
-import { useRouter } from "vue-router";
-import { useStore } from "vuex";
+import { ElMessage } from 'element-plus'
+import { useRouter } from 'vue-router'
+import { useStore } from 'vuex'
 export default {
     setup(props, content) {
-        let { proxy } = getCurrentInstance();
-        let store = useStore();
-        console.log(store.state.binDingstatus);
-        let centerDialogVisible = ref(true);
+        let { proxy } = getCurrentInstance()
+        let store = useStore()
+        console.log(store.state.binDingstatus)
+        let centerDialogVisible = ref(true)
         let phonenum = reactive({
-            phone: "",
-            code: "",
-        });
+            phone: '',
+            code: '',
+        })
         //验证冷却
         let showCode = reactive({
             status: true,
-            count: "",
+            count: '',
             timer: null,
-        });
+        })
         var phoneData = {
             to: phonenum.phone,
-            lang: "zh-cn",
+            lang: 'zh-cn',
             HasUser: true,
-            country: "86",
-        };
-        var { phoneCode } = pin(proxy);
+            country: '86',
+        }
+        var { phoneCode } = pin(proxy)
         //路由
-        const router = useRouter();
+        const router = useRouter()
         //关闭弹窗
         function close() {
-            centerDialogVisible.value = false;
-            store.commit("BindStatus", false);
+            centerDialogVisible.value = false
+            store.commit('BindStatus', false)
         }
         //监听状态值
         watch(
             () => store.state.binDingstatus,
             (a) => {
-                store.state.binDingstatus = a;
-                centerDialogVisible.value = a;
+                store.state.binDingstatus = a
+                centerDialogVisible.value = a
             }
-        );
+        )
         //验证码冷却及发送验证码
         function getCode() {
             //验证码冷却部分
-            const TIME_COUNT = 60;
+            const TIME_COUNT = 60
             if (!showCode.timer) {
-                showCode.count = TIME_COUNT;
-                showCode.status = false;
+                showCode.count = TIME_COUNT
+                showCode.status = false
                 showCode.timer = setInterval(() => {
                     if (showCode.count > 0 && showCode.count <= TIME_COUNT) {
-                        showCode.count--;
+                        showCode.count--
                     } else {
-                        showCode.status = true;
-                        clearInterval(showCode.timer);
-                        showCode.timer = null;
+                        showCode.status = true
+                        clearInterval(showCode.timer)
+                        showCode.timer = null
                     }
-                }, 1000);
+                }, 1000)
             }
             //请求接口
-            phoneCode(phoneData);
+            phoneCode(phoneData)
         }
         //手机号码绑定流程
         function bindUser(proxy) {
@@ -96,40 +96,39 @@ export default {
             let codeNum = {
                 mobile: phonenum.phone,
                 Authorization_Pin: phonenum.code,
-            };
-            console.log(codeNum, "手机号和验证码");
+            }
+            console.log(codeNum, '手机号和验证码')
             //验证手机号和验证码
             proxy.$api.verifyCode(codeNum).then((res) => {
-                console.log(res, "验证手机号和验证码");
+                console.log(res, '验证手机号和验证码')
                 if (res.error) {
                     res.error === 3 || res.error === 4
-                        ? ElMessage.error("验证码错误")
+                        ? ElMessage.error('验证码错误')
                         : res.error === 1
-                        ? ElMessage.error("无手机绑定的醍摩豆账号")
+                        ? ElMessage.error('无手机绑定的醍摩豆账号')
                         : res.error === 5
-                        ? ElMessage.error("无效的手机号码")
-                        : ElMessage.error("接口异常请重新尝试绑定");
+                        ? ElMessage.error('无效的手机号码')
+                        : ElMessage.error('接口异常请重新尝试绑定')
                 } else if (res.status && res.status === 200) {
-                    let userInfo = JSON.parse(localStorage.getItem("DingUser"));
-                    console.log(userInfo, "用户信息");
-                    let paramData = { mobile: phonenum.phone, param: userInfo };
-                    bindId(paramData, proxy);
+                    let userInfo = JSON.parse(localStorage.getItem('DingUser'))
+                    console.log(userInfo, '用户信息')
+                    let paramData = { mobile: phonenum.phone, param: userInfo }
+                    bindId(paramData, proxy)
                 }
-            });
+            })
         }
         //绑定操作
         function bindId(paramData, proxy) {
             proxy.$api.bindUserid(paramData).then((res) => {
-                console.log(res, "返回的结果");
+                console.log(res, '返回的结果')
                 res.status === 1 || res.status === 3
-                    ? ElMessage.error("绑定失败，请稍后重试")
+                    ? ElMessage.error('绑定失败，请稍后重试')
                     : res.status === 2
-                    ? ElMessage.error("账户已被绑定，请选择其他账号绑定")
+                    ? ElMessage.error('账户已被绑定，请选择其他账号绑定')
                     : res.status === 200
-                    ? (ElMessage.success("绑定成功，即将跳转..."),
-                      router.push("/home"))
-                    : ElMessage.error("出现未知错误");
-            });
+                    ? (ElMessage.success('绑定成功，即将跳转...'), router.push('/home'))
+                    : ElMessage.error('出现未知错误')
+            })
         }
         return {
             store,
@@ -143,9 +142,9 @@ export default {
             bindUser,
             bindId,
             close,
-        };
+        }
     },
-};
+}
 //发送验证码API
 function pin(proxy) {
     let phoneCode = (datas) => {
@@ -154,18 +153,16 @@ function pin(proxy) {
             lang: datas.lang,
             HasUser: datas.HasUser,
             country: datas.country,
-        };
+        }
         let { codesInfo } = proxy.$api.Phonepin(parameter).then((res) => {
-            console.log(res, "接口返回");
-            res.status === 200
-                ? ElMessage.success("验证码发送成功")
-                : ElMessage.error("验证码发送失败");
-        });
-        console.log("codesInfo", codesInfo);
-    };
+            console.log(res, '接口返回')
+            res.status === 200 ? ElMessage.success('验证码发送成功') : ElMessage.error('验证码发送失败')
+        })
+        console.log('codesInfo', codesInfo)
+    }
     return {
         phoneCode,
-    };
+    }
 }
 </script>
 <style scoped>

TEAMModeBI/ClientApp/src/view/common/aside.vue

@@ -60,7 +60,7 @@ const schoolMenus = [
                 isShow: true,
             },
             {
-                name: '区域管理',
+                name: '区级管理',
                 router: '/home/areamanage',
                 role: 'admin',
                 icon: '#icon-quyuguanli',

TEAMModeBI/ClientApp/src/view/login.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="backgorundbox">
         <div class="loginbox">
-            <div class="logintitle">醍摩豆账号登录</div>
+            <div class="logintitle">{{msgText}}</div>
             <div class="usrpwd" v-if="loginModel">
                 <div class='userbox' style="margin-bottom:10%">
                     <el-input v-model="user" placeholder="醍摩豆ID/手机号码" prefix-icon="el-icon-user" />
@@ -70,6 +70,7 @@ export default {
             text: '',
             background: '',
         })
+        let msgText = ref('钉钉账号登录')
         onMounted(() => {
             console.log(window.location.href, 'mounted!')
             if (window.location.href.indexOf('?code') != -1) {
@@ -81,7 +82,9 @@ export default {
         })
         //处理登录icon变化
         watch(loginModel, () => {
-            loginImg.value = loginModel.value == true ? (loginImg.value = require('../assets/img/erweima.png')) : (loginImg.value = require('../assets/img/mima.png'))
+            loginModel.value == true
+                ? ((loginImg.value = require('../assets/img/erweima.png')), (msgText.value = '钉钉账号登录'))
+                : ((loginImg.value = require('../assets/img/mima.png')), (msgText.value = '钉钉扫码登录'))
         })
         let { editState } = test(proxy)
         function test(proxy) {
@@ -117,9 +120,8 @@ export default {
                 res.state === 200 ? (store.commit('ChangOrganization', res.deptlist), localStorage.setItem('organization', JSON.stringify(res.deptlist))) : ''
             })
         }
-        //醍摩豆或手机登录
+        //钉钉账号或扫码登录
         function userlogin(proxy) {
-            console.log(comRef.value, '子页面的！！！！')
             loading = ElLoading.service({
                 lock: true,
                 text: 'Loading',
@@ -134,15 +136,15 @@ export default {
                 account: user.value,
                 password: pwd.value,
             }
-            proxy.$api.loginUser(params).then(async (res) => {
-                console.log(res, '登录接口返回成功！')
-                res.error
-                    ? (ElMessage.error('密码错误'), loading.close())
-                    : res.id_token
-                    ? (getTeachinfo(proxy, res.id_token), Allpermission(proxy), getOrganization(proxy))
-                    : (loading.close(), ElMessage.error('登录失败'))
-                // router.push("/home");
-            })
+            // proxy.$api.loginUser(params).then(async (res) => {
+            //     console.log(res, '登录接口返回成功！')
+            //     res.error
+            //         ? (ElMessage.error('密码错误'), loading.close())
+            //         : res.id_token
+            //         ? (getTeachinfo(proxy, res.id_token), Allpermission(proxy), getOrganization(proxy))
+            //         : (loading.close(), ElMessage.error('登录失败'))
+            //     // router.push("/home");
+            // })
         }
         //获取教师个人信息
         function getTeachinfo(proxy, param) {
@@ -188,6 +190,7 @@ export default {
             router,
             getTeachinfo,
             loading,
+            msgText,
         }
     },
 }

TEAMModeBI/ClientApp/src/view/teachermanage/areamanage.vue

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <p class="nowtitle">区域管理</p>
+        <div class="nowtitle">区域管理</div>
         <div class="traitfrom">
             <el-table :data="optionData" style="width: 100%" :highlight-current-row="true" max-height="750">
                 <el-table-column prop="index" label="编号" width="200" type=index align="center" />

TEAMModelOS/ClientApp/src/view/student-account/stulist/MgtStuList.vue

@@ -237,7 +237,7 @@ export default {
             this.saveStuList(this.stuListShow[this.curIndex])
         },
         confirmSetNo() {
-            if(!this.editIrs) return
+            if (!this.editIrs) return
             //检查IRS号码重复
             let isRepeat = false
             this.students.forEach((item, index) => {
@@ -371,7 +371,8 @@ export default {
                             name: this.listInfo.listName,
                             periodId: this.listInfo.periodId,
                             school: this.$store.state.userInfo.schoolCode,
-                            members: []
+                            members: [],
+                            scount: 0
                             // creatorId: this.$store.state.userInfo.TEAMModelId,
                             // students: [],
                             // tmids: [],
@@ -470,6 +471,7 @@ export default {
                                     this.stuList.splice(index, 1)
                                 }
                             })
+                            this.selectList(0)
                             this.$Message.success(this.$t('teachermgmt.rmvOk'))
                         },
                         err => {
@@ -495,11 +497,13 @@ export default {
                     this.$Message.success(this.$t('cusMgt.updOk'))
                     this.addStuStatus = false
                     if (isPush) {
+                        params.id = res.list.id
                         this.stuList.unshift(params)
                         this.listInfo = {
                             listName: '',
                             periodId: ''
                         }
+                        this.selectList(0)
                     } else {
                         this.stuList.splice(this.curIndex, 1, params)
                     }