Просмотр исходного кода

后端进入学校逻辑更新

dengshaobo 1 год назад
Родитель
Сommit
de4b280704
3 измененных файлов с 48 добавлено и 6 удалено
  1. 9 0
      src/api/school.ts
  2. 2 0
      src/styles/common.scss
  3. 37 6
      src/views/school/index.vue

+ 9 - 0
src/api/school.ts

@@ -120,6 +120,15 @@ export const deleteSubject = (data: any) => {
     data
     data
   })
   })
 }
 }
+
+//学校管理 -- 获取票据接口  
+export const getTicket = (params: any) => {
+  return request({
+    url: `/adminApi/v1/obtain_ticket`,
+    method: 'get',
+    params
+  })
+}
 // 免密登录
 // 免密登录
 export const loginTeach = (data: any) => {
 export const loginTeach = (data: any) => {
   return request({
   return request({

+ 2 - 0
src/styles/common.scss

@@ -18,6 +18,8 @@ li {
   padding-bottom: 30px;
   padding-bottom: 30px;
   overflow-y: hidden;
   overflow-y: hidden;
   background-color: #f0f4fb;
   background-color: #f0f4fb;
+
+  
 }
 }
 
 
 .layoutMain {
 .layoutMain {

+ 37 - 6
src/views/school/index.vue

@@ -72,7 +72,7 @@
             <el-table-column prop="tenantCode" label="学校编号" width="80" fixed="left" align="center" show-overflow-tooltip />
             <el-table-column prop="tenantCode" label="学校编号" width="80" fixed="left" align="center" show-overflow-tooltip />
             <el-table-column prop="tenantName" label="学校名称" min-width="160" fixed="left" align="center" show-overflow-tooltip>
             <el-table-column prop="tenantName" label="学校名称" min-width="160" fixed="left" align="center" show-overflow-tooltip>
               <template #default="{row}">
               <template #default="{row}">
-                <span @click="GoTeach(row)" :class="row.status == 0 || !permissions.includes('UserInfo') ? '' : 'text_color_blue'">{{ row.tenantName }}</span>
+                <span @click="GoTeach(row)" :class="row.status == 0 || row.dateDiffDayS==0 || !permissions.includes('UserInfo') ? '' : 'text_color_blue'">{{ row.tenantName }}</span>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
             <el-table-column prop="abbreviation" label="学校简称" width="120" align="center" show-overflow-tooltip>
             <el-table-column prop="abbreviation" label="学校简称" width="120" align="center" show-overflow-tooltip>
@@ -124,7 +124,7 @@
                   <span class="button_editor" @click="EditUser(row)" v-if="permissions.includes('schoolUpdate')">编辑</span>
                   <span class="button_editor" @click="EditUser(row)" v-if="permissions.includes('schoolUpdate')">编辑</span>
                   <span class="button_editor" @click="OpenAuth(row)" v-if="permissions.includes('schoolPermission')">权限</span>
                   <span class="button_editor" @click="OpenAuth(row)" v-if="permissions.includes('schoolPermission')">权限</span>
                   <span class="button_editor" @click="resetPassWord(row)" v-if="permissions.includes('schoolPassword')">重置密码</span>
                   <span class="button_editor" @click="resetPassWord(row)" v-if="permissions.includes('schoolPassword')">重置密码</span>
-                  <span class="button_editor" :class="row.status == 0 ? 'disabled_text' : ''" @click="GoTeach(row)" v-if="permissions.includes('UserInfo')">进入学校</span>
+                  <span class="button_editor" :class="row.status == 0 || row.dateDiffDayS==0 ? 'disabled_text' : ''" @click="GoTeach(row)" v-if="permissions.includes('UserInfo') ">进入学校</span>
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
@@ -149,8 +149,9 @@ import SubjectList from '@/views/school/subjectList.vue'
 import ResetPassword from '@/components/resetPassword.vue'
 import ResetPassword from '@/components/resetPassword.vue'
 import { Search } from '@element-plus/icons-vue'
 import { Search } from '@element-plus/icons-vue'
 import { ElMessageBox, ElMessage } from 'element-plus'
 import { ElMessageBox, ElMessage } from 'element-plus'
-import { getSchoolNumber, getSchoolList, changeStatus } from '@/api/school'
 import { ref, reactive, provide, onMounted, nextTick, onUnmounted } from 'vue'
 import { ref, reactive, provide, onMounted, nextTick, onUnmounted } from 'vue'
+import { getSchoolNumber, getSchoolList, changeStatus ,getTicket} from '@/api/school'
+
 interface UserNumber {
 interface UserNumber {
   allUser: number
   allUser: number
   officialUser: number
   officialUser: number
@@ -323,9 +324,39 @@ const ChangeStatus = (row: any, text: String) => {
 }
 }
 // 进入学校
 // 进入学校
 const GoTeach = (row: any) => {
 const GoTeach = (row: any) => {
-  if(row.status == 0) return
-  let accessToken = localStorage.getItem('token')
-  window.open(`https://www.k12100.com/#/otherLogin?schoolId=${row.id}&adminToken=${accessToken}`)
+  //剩余天数为0的禁止进入学校
+  if(row.status == 0 || row.dateDiffDayS==0) 
+  {
+    if(row.dateDiffDayS==0)
+    {
+      ElMessage.error('该学校已到期,请续费!')
+    }
+    
+    return
+  }
+
+  console.log("打印row",row)
+   let params = {
+    schoolId: row.id,
+  }
+  
+  getTicket(params).then((res: any) => {
+    console.log("打印获取票据接口返回res",res)
+    if(res.code == 200 && res.data) 
+    {
+      let ticket = res.data;
+      let url=`https://www.k12100.com/#/otherLogin?schoolId=${row.id}&ticket=${ticket}`;//正式环境
+      // let url=`https://dev3.k12100.net/#/otherLogin?schoolId=${row.id}&ticket=${ticket}`;//测试环境
+      console.log("打印获取票据接口返回ticket",ticket)
+      console.log("打印第三方登录地址",url);
+      // window.open(`https://www.k12100.com/#/otherLogin?schoolId=${row.id}&ticket=${ticket}`)
+       window.open(url)
+    }
+    
+  }).catch(() => {
+   
+  })
+  
 }
 }
 // 重置密码
 // 重置密码
 const resetPassWord = (row: any) => {
 const resetPassWord = (row: any) => {