提交

ruoyi-ui/src/api/system/table.js

@@ -46,9 +46,10 @@ export function updateTable(data) {
 }
 
 // 删除课程
-export function delTable(id) {
+export function delTable(query) {
   return request({
-    url: '/course/table/delete/' + id,
-    method: 'get'
+    url: '/course/table/delete/classId',
+    method: 'get',
+    params: query
   })
 }

ruoyi-ui/src/api/system/time.js

@@ -46,9 +46,10 @@ export function updateTime(data) {
 }
 
 // 删除课程-时间
-export function delTime(id) {
+export function delTime(query) {
   return request({
-    url: '/course/time/delete/' + id,
-    method: 'get'
+    url: '/course/time/delete/schoolId',
+    method: 'get',
+     params: query
   })
 }

ruoyi-ui/src/api/zhihuixy/record.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询请假记录信息列表
 export function listLeave(query) {
   return request({
-    url: '/record/leave/list',
+    url: '/ask/leave/list',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listLeave(query) {
 // 查询请假记录信息详细
 export function getLeave(id) {
   return request({
-    url: '/record/leave/' + id,
+    url: '/ask/leave/' + id,
     method: 'get'
   })
 }
@@ -20,7 +20,7 @@ export function getLeave(id) {
 // 新增请假记录信息
 export function addLeave(data) {
   return request({
-    url: '/record/leave',
+    url: '/ask/leave',
     method: 'post',
     data: data
   })
@@ -29,7 +29,7 @@ export function addLeave(data) {
 // 修改请假记录信息
 export function updateLeave(data) {
   return request({
-    url: '/record/leave/put',
+    url: '/ask/leave/put',
     method: 'post',
     data: data
   })
@@ -38,7 +38,17 @@ export function updateLeave(data) {
 // 删除请假记录信息
 export function delLeave(id) {
   return request({
-    url: '/record/leave/delete/' + id,
+    url: '/ask/leave/delete/' + id,
     method: 'get'
   })
-}
+}
+
+export function sh(data) {
+ return request({
+   url: '/ask/leave/sh',
+   method: 'post',
+   data: data
+ })
+}
+
+

ruoyi-ui/src/api/zhihuixy/teacherdan.js

@@ -25,6 +25,16 @@ export function listInfostu(query) {
   })
 }
 
+export function listInfostutwo(query) {
+  return request({
+    url: '/formal/class/noPage/list',
+    method: 'get',
+    params: query
+  })
+}
+
+
+
 
 // 查询学生档案信息详细
 export function getInfo(id) {
@@ -58,4 +68,4 @@ export function delInfo(id) {
     url: '/teacher/info/delete/' + id,
     method: 'get'
   })
-}
+}

ruoyi-ui/src/api/zhihuixy/tenant.js

@@ -68,6 +68,15 @@ export function dynamicTenant(tenantId) {
   });
 }
 
+// 根据动态切换组合2
+export function dynamicTenantgw(data) {
+  return request({
+    url: '/system/tenant/dynamic/loginBody',
+    method: 'post',
+    data: data
+  });
+}
+
 // 清除动态租户
 export function dynamicClear() {
   return request({
@@ -88,3 +97,11 @@ export function syncTenantPackage(tenantId, packageId) {
     params: data
   });
 }
+// 根据username查询租户信息
+export function userNamet(query) {
+  return request({
+    url: '/system/tenant/userName/list',
+    method: 'get',
+    params: query
+  });
+}

ruoyi-ui/src/layout/components/Navbar.vue

@@ -27,6 +27,19 @@
 			  <el-option v-for="item in tenantList" :key="item.tenantId" :label="item.companyName" :value="item.tenantId"> </el-option>
 			  <template ><svg-icon icon-class="company" class="el-input__icon input-icon" /></template>
 			</el-select>
+      <el-select
+        v-model="companyName"
+        clearable
+        filterable
+        reserve-keyword
+        placeholder="选择学校"
+        v-if="userId != 1 && (tenantListtw.length !=0 && tenantListtw.length !=1)"
+        @change="dynamicTenantEventg"
+        @clear="dynamicClearEvent"
+      >
+        <el-option v-for="item in tenantListtw" :key="item.tenantId" :label="item.companyName" :value="item.tenantId"> </el-option>
+        <template ><svg-icon icon-class="company" class="el-input__icon input-icon" /></template>
+      </el-select>
       <!-- <template v-if="device!=='mobile'">
         <search id="header-search" class="right-menu-item" />
 
@@ -103,8 +116,9 @@ import SizeSelect from '@/components/SizeSelect'
 import Search from '@/components/HeaderSearch'
 import RuoYiGit from '@/components/RuoYi/Git'
 import RuoYiDoc from '@/components/RuoYi/Doc'
-import { getCodeImg,register,getTenantList } from "@/api/login";
-import { dynamicClear, dynamicTenant } from "@/api/zhihuixy/tenant";
+import { getCodeImg,register,getTenantList,getInfo } from "@/api/login";
+import { dynamicClear, dynamicTenant,userNamet,dynamicTenantgw } from "@/api/zhihuixy/tenant";
+import { getToken, setToken, removeToken } from '@/utils/auth'
 
 export default {
   components: {
@@ -117,7 +131,7 @@ export default {
     RuoYiGit,
     RuoYiDoc
   },
-  
+
   computed: {
     ...mapGetters([
       'sidebar',
@@ -153,15 +167,30 @@ export default {
 	  return {
 	    tenantEnabled:true,
 			tenantList:[],
-		companyName:null,
+		  companyName:null,
+      tenantListtw:[],
+      usename:'',
+      timer:null
 	  };
 	},
-	
+
   created() {
   	console.log(this.$store.state.user)
-	this.getnhgw()
+    this.usename = this.$store.state.user.name
+    if(this.usename =='admin'){
+      this.getnhgw()
+    }else{
+      this.getnhgwon()
+    }
+  },
+  mouted(){
+    // this.$nextTick(()=>{
+                   let router_path = this.$route.path
+                   console.log(router_path)    // 输出当前页面的路由，如：/home
+               // })
+
   },
-  
+
   methods: {
 		getnhgw(){
 		  // this.loading = true;
@@ -169,22 +198,57 @@ export default {
 			  // this.tenantEnabled = response.data.tenantEnabled
 		    this.tenantList = response.data.voList;
 		    // this.loading = false;
-		  });	
+		  });
 		},
+    getnhgwon(){
+      // this.loading = true;
+      let ngse={'userName': this.usename}
+      userNamet(ngse).then(response => {
+    	  // this.tenantEnabled = response.data.tenantEnabled
+        this.tenantListtw = response.data;
+        if(response.data.length !=0 || response.data.length !=1){
+          this.tenantEnabled = false
+        }
+
+
+        // this.loading = false;
+      });
+    },
 		dynamicTenantEvent(){
 			if (this.companyName != null && this.companyName !== '') {
 			  dynamicTenant(this.companyName).then(response => {
 			  	this.dynamic = true;
+
 			  	this.$tab.closeAllPage();
 			  	this.$router.push('/');
 			  });
 			}
 		},
+    dynamicTenantEventg(){
+    	if (this.companyName != null && this.companyName !== '') {
+        let ngpw={'tenantId':this.companyName,'clientId':'e5cd7e4891bf95d1d19206ce24a7b32e','grantType':'password'}
+    	  dynamicTenantgw(ngpw).then(response => {
+    	  	this.dynamic = true;
+           setToken(response.data.access_token)
+           let ngse={'userName': this.usename}
+           getInfo().then(response => {
+             // this.loading = false;
+             location.reload(true)
+             this.$tab.closeAllPage();
+             this.$router.push('/');
+           });
+    	  	// this.$tab.closeAllPage();
+    	  	// this.$router.push('/');
+    	  });
+    	}
+    },
 		dynamicClearEvent(){
 			dynamicClear().then(response => {
 				this.dynamic = false;
 				this.$tab.closeAllPage();
 				this.$router.push('/');
+
+
 			});
 		},
     toggleSideBar() {
@@ -207,7 +271,7 @@ export default {
 	  }
 	  this.$store.dispatch('TabFn', item.path)
 	  this.showde = true
-	
+
 	},
 	init() {
 	  const route = this.$route;

ruoyi-ui/src/main.js

@@ -45,10 +45,13 @@ import Editor from "@/components/Editor"
 // 文件上传组件
 import FileUpload from "@/components/FileUpload"
 import FileUploads from "@/components/FileUploads"
+import FileUploadsch from "@/components/FileUploadsch"
+
 
 // 图片上传组件
 import ImageUpload from "@/components/ImageUpload"
 import ImageUploads from "@/components/ImageUploads"
+import ImageUploadslis from "@/components/ImageUploadslis"
 // 图片预览组件
 import ImagePreview from "@/components/ImagePreview"
 // 字典标签组件
@@ -88,9 +91,12 @@ Vue.component('Steps', Steps)
 
 Vue.component('FileUpload', FileUpload)
 Vue.component('FileUploads', FileUploads)
+Vue.component('FileUploadsch', FileUploadsch)
+
 
 Vue.component('ImageUpload', ImageUpload)
 Vue.component('ImageUploads', ImageUploads)
+Vue.component('ImageUploadslis', ImageUploadslis)
 Vue.component('ImagePreview', ImagePreview)
 Vue.component('tinymce', Tinymce)
 

ruoyi-ui/src/settings.js

@@ -1,6 +1,6 @@
 module.exports = {
-    urls: `http://192.168.101.168:8030`,
     // urls: `http://192.168.101.245:8030`,
+    urls: `http://192.168.101.168:8030`,
     // urls:`https://xy.cnzxy.cn`,
     // urls: `http://47.99.82.249:5010`,
 

ruoyi-ui/src/store/modules/user.js

@@ -14,7 +14,8 @@ const user = {
 	schoolId:0,
 	nickName:'',
 	userId:0,
-	tenantId:0
+	tenantId:0,
+  userType:''
 
   },
 
@@ -55,11 +56,14 @@ const user = {
 	SET_TENANTID: (state, tenantId) => {
 	  state.tenantId = tenantId
 	},
-	
-	
-	
-	
-		
+  SET_USERTYPE: (state, userType) => {
+    state.userType = userType
+  },
+
+
+
+
+
   },
 
   actions: {
@@ -103,8 +107,9 @@ const user = {
 		 commit('SET_SCHOOL_ID', res.data.schoolId)
 		 commit('SET_NIKE_NAME', user.nickName)
 		 commit('SET_USERID', user.userId)
+     commit('SET_USERTYPE', user.userType)
 		 commit('SET_TENANTID', user.tenantId)
-		 
+
           resolve(res)
         }).catch(error => {
           reject(error)

ruoyi-ui/src/views/index.vue

@@ -296,23 +296,23 @@
 					</div>
 
 					<div v-show="xshe">
-						<el-table v-loading="loading" :data="studentList" :max-height="150" >
-						  <el-table-column type="selection" width="55" align="center" />
-						  <el-table-column label="家长姓名" align="center" prop="parentsName" />
+						<el-table v-loading="loading" :data="studentList" :max-height="250" >
+						  <!-- <el-table-column type="selection" width="55" align="center" /> -->
+						  <el-table-column label="家长姓名" align="center" prop="parentsName" width="100"/>
 						  <el-table-column label="学校名称" align="center" prop="schoolName" width="120"/>
 						  <el-table-column label="班级名称" align="center" prop="className" width="120"/>
-						  <el-table-column label="姓名" align="center" prop="studentName" />
-						  <el-table-column label="学号" align="center" prop="studentNumber" />
+						  <el-table-column label="姓名" align="center" prop="studentName" width="80"/>
+						  <el-table-column label="学号" align="center" prop="studentNumber" width="80"  show-overflow-tooltip/>
 						   <el-table-column label="联系方式" align="center" prop="parentsPhone" width="120"/>
 
-						  <el-table-column label="审核人" align="center" prop="auditUser" />
-						  <el-table-column label="审核结果" align="center" prop="isPass">
+						 <!-- <el-table-column label="审核人" align="center" prop="auditUser" width="100"/>
+						  <el-table-column label="审核结果" align="center" prop="isPass" width="100">
 						    <template slot-scope="scope">
 						    <dict-tag :options="dict.type.shhjg" :value="scope.row.isPass"/>
 						    </template>
 						  </el-table-column>
-						  <el-table-column label="审核意见" align="center" prop="opinion" />
-						  <el-table-column label="备注" align="center" prop="remark" />
+						  <el-table-column label="审核意见" align="center" prop="opinion" width="120"/>
+						  <el-table-column label="备注" align="center" prop="remark"  width="100"/> -->
 						  <el-table-column label="操作"  width="160" align="center" class-name="small-padding fixed-width">
 						    <template slot-scope="scope">
 
@@ -345,16 +345,16 @@
 						  <el-table-column type="selection" width="55" align="center" />
 						  <!-- <el-table-column label="ID" align="center" prop="id" /> -->
 						  <el-table-column label="学校名称" align="center" prop="schoolName" />
-						  <el-table-column label="负责人" align="center" prop="userName" />
-						  <el-table-column label="联系方式" align="center" prop="userPhone" />
-						  <el-table-column label="审核人" align="center" prop="auditUser" />
-						  <el-table-column label="审核结果" align="center" prop="isPass">
+						  <el-table-column label="负责人" align="center" prop="userName" width="120" />
+						  <el-table-column label="联系方式" align="center" prop="userPhone"width="120" />
+						  <!-- <el-table-column label="审核人" align="center" prop="auditUser" width="120" />
+						  <el-table-column label="审核结果" align="center" prop="isPass" width="120">
 						    <template slot-scope="scope">
 						    <dict-tag :options="dict.type.shhjg" :value="scope.row.isPass"/>
 						    </template>
 						  </el-table-column>
-						  <el-table-column label="审核意见" align="center" prop="opinion" />
-						  <el-table-column label="备注" align="center" prop="remark" />
+						  <el-table-column label="审核意见" align="center" prop="opinion"  width="120"/> -->
+						  <el-table-column label="备注" align="center" prop="remark"  />
 						  <el-table-column label="操作" width="160" align="center" class-name="small-padding fixed-width">
 						    <template slot-scope="scope">
 						      <!-- <el-button
@@ -394,16 +394,16 @@
 						 <!-- <el-table-column type="selection" width="55" align="center" />
 						  <el-table-column label="ID" align="center" prop="id" />
 						  <el-table-column label="学校id" align="center" prop="schoolId" /> -->
-						  <el-table-column label="学校名称" align="center" prop="schoolName" width="120"/>
-						  <el-table-column label="姓名" align="center" prop="userName" />
+						  <el-table-column label="学校名称" align="center" prop="schoolName" />
+						  <el-table-column label="姓名" align="center" prop="userName"width="120" />
 						  <el-table-column label="联系方式" align="center" prop="userPhone" width="120"/>
-						  <el-table-column label="审核人" align="center" prop="auditUser" />
-						  <el-table-column label="审核结果" align="center" prop="isPass">
+						 <!-- <el-table-column label="审核人" align="center" prop="auditUser" width="120"/>
+						  <el-table-column label="审核结果" align="center" prop="isPass" width="120">
 						    <template slot-scope="scope">
 						    <dict-tag :options="dict.type.shhjg" :value="scope.row.isPass"/>
 						    </template>
 						  </el-table-column>
-						  <el-table-column label="审核意见" align="center" prop="opinion" />
+						  <el-table-column label="审核意见" align="center" prop="opinion" width="120"/> -->
 						  <el-table-column label="备注" align="center" prop="remark" />
 						  <el-table-column label="操作"   width="160" align="center" class-name="small-padding fixed-width" >
 						    <template slot-scope="scope">
@@ -523,7 +523,7 @@
 					  <div style="padding-right: 3px; background-color: #fff; border-radius: 12px; padding: 10px; ">
 						<p style="margin: 0; margin-bottom: 10px;" class="p"><img src="../assets/images/icon_hthp_tktz.png" alt="">调课通知</p>
 
-						<div  style="overflow:auto;height: 300px; ">
+						<div  style="overflow:auto;height: 380px; ">
 												 <div class="infinite-list">
 													<div class="nhyewgnmu"  >
 														<!-- :class="it/2 == 0 ?'index_ade' : 'index_ades'" -->
@@ -550,7 +550,15 @@
 																			  		<p>调课科目: <span>暂无数据</span> </p>
 																			  		<p>被调科目: <span>暂无数据</span></p>
 																			    </div>
-																			  </el-card>
+																			  </el-card>
+                                        <el-card class="box-card bgehje"  v-show="changeList.length ==0">
+                                          <div  class="text item">
+                                        		<p>调课班级: <span>暂无数据</span></p>
+                                        		<p>调课时间: <span>暂无数据</span> </p>
+                                        		<p>调课科目: <span>暂无数据</span> </p>
+                                        		<p>被调科目: <span>暂无数据</span></p>
+                                          </div>
+                                        </el-card>
 
 													</div>
 													 <div style="background-color: #fff; height: 50px;margin-top: 10px;" class="nhyksuef">
@@ -575,7 +583,7 @@
 
 			  </el-row>
 			  <el-row style="border-radius: 10px; overflow: hidden;">
-			  				 <el-col :span="24" style="background-color: #fff; border-top-left-radius: 10px;border-top-right-radius: 10px ; margin: 15px 0 0 0; padding: 10px;">
+			  				 <el-col :span="24" style="background-color: #fff; border-top-left-radius: 10px;border-top-right-radius: 10px ; margin: 15px 0 0 0; padding: 20px 10px 20px 10px;">
 			  				 					<p  class="nbgewfjidex p" style="margin: 0;"><img src="../assets/images/icon_hthp_kjgn.png" alt="">快捷功能</p>
 			  				 </el-col>
 			  				 <el-col :span="24" style="background-color: #fff;  ">
@@ -770,7 +778,7 @@
    <img src="../assets/images/pic_xyht_wsxx_bg .png" alt="" style="height: 95vh; width: 100%;">
    <img src="../assets/images/pic_xyht_wsxx_xxts.png" alt="" style="height: 170px; width: 250px;position: absolute;top: 244px;left: 175px;">
    <div class="nbhw">
-     <p>您的账号信息还未完善 </p>
+     <p>您的账号信息还未完善(完善后前去移动端查看审核结果.) </p>
      <p>请立即前往完善您的学校、班级及身份选择(完善好信息请点击<span style="color:red;cursor: pointer;" @click="logout">退出登录</span>，重新登录.)</p>
      <div class="ngetow">
        <p @click="isshode" style="cursor: pointer;">完善信息(我是学校) →</p>
@@ -850,7 +858,7 @@
 			  	</el-col>
 						  <el-col :span="10">
 						  	<el-form-item label="课程" prop="discipline">
-						  		<el-select style="width: 100%;" v-model="item.discipline" placeholder="请选择第一节课">
+						  		<el-select style="width: 100%;" v-model="item.discipline" placeholder="请选择课程">
 						  		            <el-option
 						  		              v-for="dict in tyowe"
 						  		              :key="dict.dictValue"
@@ -1085,7 +1093,7 @@
 		  <el-col :span="18">
 		  	<el-card shadow="hover" class="box-card" v-for="o in 12" :key="o">
 		  	  <div  class="text item">
-		  	      <!-- {{'列表内容 ' + o }} -->
+		  	    <!-- {{'列表内容 ' + o }} -->
 				  <p style="color:#aaa;">2023-07-27  14:12:08</p>
 				  <el-divider></el-divider>
 				  <p><span>学生姓名:</span>1</p>
@@ -1474,19 +1482,32 @@ export default {
           tenantList:[],
           tyowe:[]
     }
-  },
+  },
+  watch:{
+  	$route(to,from){
+  	  console.log(from.path);//从哪来
+  	}
+  },
+
   created() {
-    
+    console.log('参数')
+     console.log(this.$store.state.user.userType,this.$store.state.user)
     if(this.$store.state.user.userType == 'register'){
       this.isshoue = false
-      this.getdept(0)
-      this.getgtsg(0)
+      // this.getdept(0)
+      // this.getgtsg(0)
       this.getnhgw()
+      listDeptwqx(0).then(response => {
+
+        this.deptOptionst = response.data
+
+      });
+      // this.getgtsg()
     }else{
       this.isshoue = true
       this.getLocation()
         this.queryParams.schoolId = this.$store.state.user.schoolId
-      console.log(this.queryParams.schoolId,17)
+      // console.log(this.queryParams.schoolId,17)
         var tempDate = new Date() // 获取今天的日期
         tempDate.setDate(tempDate.getDate() - 1) // 今天的前N天的日期，N自定义
         let endDate = tempDate.getFullYear() + '-' + (tempDate.getMonth() + 1) + '-' + tempDate.getDate()
@@ -2318,12 +2339,10 @@ export default {
     mjyhessx(row){
       this.formt.schoolId = row.deptId
       this.formt.schoolName = row.deptName
+      this.formt.tenantId = row.tenantId
       let kuesf=  {'parentId':row.deptId}
-
        listDeptwqx(row.deptId).then(response => {
-
          this.kiuesegh = response.data
-
        });
         let kuesff=  {'dictType':'sys_subject','tenantId':row.tenantId}
        tegetypw(kuesff).then(response => {
@@ -2342,157 +2361,174 @@ export default {
 	    this.loading = true;
 		// console.log(this.classTableData.weekCourse,82)
 		this.flseg = false
-
 	    listTablexg(this.queryParams).then(response => {
-			if(response.rows.length != 0){
-				for(var i = 0 ; i < response.rows.length;i++){
+			if(response.rows.length != 0){
+        this.classTableData.weekCourse = []
+        	for(var i = 0 ; i < response.rows.length;i++){
+            let isje = {'week': i+1,'courses': []}
+                for(var j = 0;j <response.rows[i].length; j++){
+                  // console.log(4)
+                  // console.log(response.rows[i],8)
+                   let ijkse={'index':j+1,'title':response.rows[i][j].courseName,'teach':response.rows[i][j].courseTeacher,'backger':'#e6e6e6',
+                   'schoolId':response.rows[i][j].schoolId,'classId':response.rows[i][j].classId,'week': i+1,'timeFrame':response.rows[i][j].timeFrame,'teacherType':response.rows[i][j].teacherType}
+                   if(response.rows[i][j].teacherType == true){
+                     ijkse.iscol = '#4775ea'
+                   }
+                  isje.courses.push(ijkse)
+                }
+            this.classTableData.weekCourse.push(isje)
+            console.log(this.classTableData,response.rows[i],6)
+
+        	}
+        console.log(this.classTableData.weekCourse,7)
+				// for(var i = 0 ; i < response.rows.length;i++){
 					// if(response.rows[i].week == 1){
 						// this.classTableData.weekCourse[response.rows[i].week - 1].courses[0].title = response.rows[i].oneClass
-						this.classTableData.weekCourse[response.rows[i].week - 1].courses.filter(rou=>{
-							if(rou.index == 1){
-								if(response.rows[i].oneClass !== null){
-									rou.title = response.rows[i].oneClass
-									if(response.rows[i].teacherClassName != null){
-										let ngw = response.rows[i].teacherClassName
-										ngw.filter( rjh =>{
-											if(rou.title == rjh){
-												rou.iscol = '#4775ea'
-											}
-										})
-									}
-									rou.teach = response.rows[i].oneTeacher
-								}else{
-									rou.title = '--'
-									rou.teach = '--'
-								}
-								console.log(rou.title,27)
-								// this.$set(rou, title, response.rows[i].oneClass)
-							}
-							if(rou.index == 2){
-								if(response.rows[i].twoClass !== null){
-									rou.title = response.rows[i].twoClass
-									if(response.rows[i].teacherClassName != null){
-										let ngw = response.rows[i].teacherClassName
-										ngw.filter( rjh =>{
-											if(rou.title == rjh){
-												rou.iscol = '#4775ea'
-											}
-										})
-									}
-									rou.teach = response.rows[i].twoTeacher
-								}else{
-									rou.title = '--'
-									rou.teach = '--'
-								}
-								console.log(rou.title,28)
-							}
-							if(rou.index == 3){
-								if(response.rows[i].threeClass !== null){
-									if(response.rows[i].teacherClassName != null){
-										let ngw = response.rows[i].teacherClassName
-										ngw.filter( rjh =>{
-											if(rou.title == rjh){
-												rou.iscol = '#4775ea'
-											}
-										})
-									}
-									rou.title = response.rows[i].threeClass
-									rou.teach = response.rows[i].threeTeacher
-								}else{
-									rou.title = '--'
-									rou.teach = '--'
-								}
-							}
-							if(rou.index == 4){
-								if(response.rows[i].fourClass !== null){
-									rou.title = response.rows[i].fourClass
-									rou.teach = response.rows[i].fourTeacher
-									if(response.rows[i].teacherClassName != null){
-										let ngw = response.rows[i].teacherClassName
-										ngw.filter( rjh =>{
-											if(rou.title == rjh){
-												rou.iscol = '#4775ea'
-											}
-										})
-									}
-								}else{
-									rou.title = '--'
-									rou.teach = '--'
-								}
-							}
-							if(rou.index == 5){
-								if(response.rows[i].fiveClass !== null){
-									rou.title = response.rows[i].fiveClass
-									rou.teach = response.rows[i].fiveTeacher
-									if(response.rows[i].teacherClassName != null){
-										let ngw = response.rows[i].teacherClassName
-										ngw.filter( rjh =>{
-											if(rou.title == rjh){
-												rou.iscol = '#4775ea'
-											}
-										})
-									}
-								}else{
-									rou.title = '--'
-									rou.teach = '--'
-								}
-								// rou.title = response.rows[i].fiveClass
-							}
-							if(rou.index == 6){
-								if(response.rows[i].sixClass !== null){
-									rou.title = response.rows[i].sixClass
-									rou.teach = response.rows[i].sixTeacher
-									if(response.rows[i].teacherClassName != null){
-										let ngw = response.rows[i].teacherClassName
-										ngw.filter( rjh =>{
-											if(rou.title == rjh){
-												rou.iscol = '#4775ea'
-											}
-										})
-									}
-								}else{
-									rou.title = '--'
-									rou.teach = '--'
-								}
-							}
-							if(rou.index == 7){
-								if(response.rows[i].sevenClass !== null){
-									rou.title = response.rows[i].sevenClass
-									rou.teach = response.rows[i].sevenTeacher
-									if(response.rows[i].teacherClassName != null){
-										let ngw = response.rows[i].teacherClassName
-										ngw.filter( rjh =>{
-											if(rou.title == rjh){
-												rou.iscol = '#4775ea'
-											}
-										})
-									}
-								}else{
-									rou.title = '--'
-									rou.teach = '--'
-								}
-							}
-							if(rou.index == 8){
-								if(response.rows[i].eightClass !== null){
-									rou.title = response.rows[i].eightClass
-									rou.teach = response.rows[i].eightTeacher
-									if(response.rows[i].teacherClassName != null){
-										let ngw = response.rows[i].teacherClassName
-										ngw.filter( rjh =>{
-											if(rou.title == rjh){
-												rou.iscol = '#4775ea'
-											}
-										})
-									}
-								}else{
-									rou.title = '--'
-									rou.teach = '--'
-								}
-								// rou.title = response.rows[i].eightClass
-							}
-						})
+            // this.classTableData.weekCourse[response.rows[i].week - 1].courses.filter(rou=>{
+							// if(rou.index == 1){
+							// 	if(response.rows[i].oneClass !== null){
+							// 		rou.title = response.rows[i].oneClass
+							// 		if(response.rows[i].teacherClassName != null){
+							// 			let ngw = response.rows[i].teacherClassName
+							// 			ngw.filter( rjh =>{
+							// 				if(rou.title == rjh){
+							// 					rou.iscol = '#4775ea'
+							// 				}
+							// 			})
+							// 		}
+							// 		rou.teach = response.rows[i].oneTeacher
+							// 	}else{
+							// 		rou.title = '--'
+							// 		rou.teach = '--'
+							// 	}
+							// 	console.log(rou.title,27)
+							// 	// this.$set(rou, title, response.rows[i].oneClass)
+							// }
+							// if(rou.index == 2){
+							// 	if(response.rows[i].twoClass !== null){
+							// 		rou.title = response.rows[i].twoClass
+							// 		if(response.rows[i].teacherClassName != null){
+							// 			let ngw = response.rows[i].teacherClassName
+							// 			ngw.filter( rjh =>{
+							// 				if(rou.title == rjh){
+							// 					rou.iscol = '#4775ea'
+							// 				}
+							// 			})
+							// 		}
+							// 		rou.teach = response.rows[i].twoTeacher
+							// 	}else{
+							// 		rou.title = '--'
+							// 		rou.teach = '--'
+							// 	}
+							// 	console.log(rou.title,28)
+							// }
+							// if(rou.index == 3){
+							// 	if(response.rows[i].threeClass !== null){
+							// 		if(response.rows[i].teacherClassName != null){
+							// 			let ngw = response.rows[i].teacherClassName
+							// 			ngw.filter( rjh =>{
+							// 				if(rou.title == rjh){
+							// 					rou.iscol = '#4775ea'
+							// 				}
+							// 			})
+							// 		}
+							// 		rou.title = response.rows[i].threeClass
+							// 		rou.teach = response.rows[i].threeTeacher
+							// 	}else{
+							// 		rou.title = '--'
+							// 		rou.teach = '--'
+							// 	}
+							// }
+							// if(rou.index == 4){
+							// 	if(response.rows[i].fourClass !== null){
+							// 		rou.title = response.rows[i].fourClass
+							// 		rou.teach = response.rows[i].fourTeacher
+							// 		if(response.rows[i].teacherClassName != null){
+							// 			let ngw = response.rows[i].teacherClassName
+							// 			ngw.filter( rjh =>{
+							// 				if(rou.title == rjh){
+							// 					rou.iscol = '#4775ea'
+							// 				}
+							// 			})
+							// 		}
+							// 	}else{
+							// 		rou.title = '--'
+							// 		rou.teach = '--'
+							// 	}
+							// }
+							// if(rou.index == 5){
+							// 	if(response.rows[i].fiveClass !== null){
+							// 		rou.title = response.rows[i].fiveClass
+							// 		rou.teach = response.rows[i].fiveTeacher
+							// 		if(response.rows[i].teacherClassName != null){
+							// 			let ngw = response.rows[i].teacherClassName
+							// 			ngw.filter( rjh =>{
+							// 				if(rou.title == rjh){
+							// 					rou.iscol = '#4775ea'
+							// 				}
+							// 			})
+							// 		}
+							// 	}else{
+							// 		rou.title = '--'
+							// 		rou.teach = '--'
+							// 	}
+							// 	// rou.title = response.rows[i].fiveClass
+							// }
+							// if(rou.index == 6){
+							// 	if(response.rows[i].sixClass !== null){
+							// 		rou.title = response.rows[i].sixClass
+							// 		rou.teach = response.rows[i].sixTeacher
+							// 		if(response.rows[i].teacherClassName != null){
+							// 			let ngw = response.rows[i].teacherClassName
+							// 			ngw.filter( rjh =>{
+							// 				if(rou.title == rjh){
+							// 					rou.iscol = '#4775ea'
+							// 				}
+							// 			})
+							// 		}
+							// 	}else{
+							// 		rou.title = '--'
+							// 		rou.teach = '--'
+							// 	}
+							// }
+							// if(rou.index == 7){
+							// 	if(response.rows[i].sevenClass !== null){
+							// 		rou.title = response.rows[i].sevenClass
+							// 		rou.teach = response.rows[i].sevenTeacher
+							// 		if(response.rows[i].teacherClassName != null){
+							// 			let ngw = response.rows[i].teacherClassName
+							// 			ngw.filter( rjh =>{
+							// 				if(rou.title == rjh){
+							// 					rou.iscol = '#4775ea'
+							// 				}
+							// 			})
+							// 		}
+							// 	}else{
+							// 		rou.title = '--'
+							// 		rou.teach = '--'
+							// 	}
+							// }
+							// if(rou.index == 8){
+							// 	if(response.rows[i].eightClass !== null){
+							// 		rou.title = response.rows[i].eightClass
+							// 		rou.teach = response.rows[i].eightTeacher
+							// 		if(response.rows[i].teacherClassName != null){
+							// 			let ngw = response.rows[i].teacherClassName
+							// 			ngw.filter( rjh =>{
+							// 				if(rou.title == rjh){
+							// 					rou.iscol = '#4775ea'
+							// 				}
+							// 			})
+							// 		}
+							// 	}else{
+							// 		rou.title = '--'
+							// 		rou.teach = '--'
+							// 	}
+							// 	// rou.title = response.rows[i].eightClass
+							// }
+						// })
 					// }
-				}
+				// }
 				// response.rows.filter(rou=>{
 				// 	if(rou.week == 1){
 				// 		this.classTableData.weekCourse[rou.week - 1].courses[0].title = rou.oneClass
@@ -2504,89 +2540,106 @@ export default {
 			}
 
 	      this.tableList = response.rows;
-		  console.log(this.tableList,this.classTableData,19)
+		  console.log(this.tableList,this.classTableData,19)
+      this.initWeekCourses();
+       this.updateData();
 		  this.flseg = true
 	      this.total = response.total;
-	      this.loading = false;
+	      this.loading = false;
+
 	    });
 	  },
 	  /** 查询课程-时间列表 */
 	  getListd() {
 	    this.loading = true;
-
+      this.flseg = false
 	    listTime(this.queryParams).then(response => {
 	      // this.timeList = response.rows;
-		  let one = ''
-		  let two = ''
-		  let three = ''
-		  let four = ''
-		  let five = ''
-		  let six = ''
-		  let seven = ''
-		  let eight = ''
-		  if(response.rows.length !=0){
+		  // let one = ''
+		  // let two = ''
+		  // let three = ''
+		  // let four = ''
+		  // let five = ''
+		  // let six = ''
+		  // let seven = ''
+		  // let eight = ''
+      let nd = []
+		  if(response.rows.length !=0){
+        for(var i=0; i< response.rows.length; i++){
+          if(response.rows[i].startTime != null && response.rows[i].startTime!=''){
+            if(response.rows[i].endTime != null && response.rows[i].endTime!=''){
+               let hge = ''
+              hge = response.rows[i].startTime + '-' + response.rows[i].endTime
+              nd.push(hge)
+            }
+          }
+
+
+        }
+        this.classTableData.period = nd
 			  // if(response.rows.){
 
 			  // }
 			  // this.classTableData.period[0] = response.rows[0].oneStartTime + response.rows[0].oneEndTime
-			one = response.rows[0].oneStartTime
-			one = one + '-' + response.rows[0].oneEndTime
-			two = response.rows[0].twoStartTime
-			two = two + '-' + response.rows[0].twoEndTime
-			three = response.rows[0].threeStartTime
-			three  = three + '-' + response.rows[0].threeEndTime
-			four = response.rows[0].fourStartTime
-			four = four + '-' + response.rows[0].fourEndTime
-			five = response.rows[0].fiveStartTime
-			five = five + '-' + response.rows[0].fiveEndTime
-			if(response.rows[0].fourStartTime == null){
-				response.rows[0].fourStartTime = ''
-			}
-			if(response.rows[0].fourEndTime == null){
-				response.rows[0].fourEndTime = ''
-			}
-			if(response.rows[0].fiveStartTime == null){
-				response.rows[0].fiveStartTime = ''
-			}
-			if(response.rows[0].fiveEndTime == null){
-				response.rows[0].fiveEndTime = ''
-			}
-			if(response.rows[0].sixStartTime == null){
-				response.rows[0].sixStartTime = ''
-			}
-			if(response.rows[0].sixEndTime == null){
-				response.rows[0].sixEndTime = ''
-			}
-			if(response.rows[0].sevenStartTime == null){
-				response.rows[0].sevenStartTime = ''
-			}
-			if(response.rows[0].sevenStartTime == null){
-				response.rows[0].sevenStartTime = ''
-			}
-			if(response.rows[0].eightStartTime == null){
-				response.rows[0].eightStartTime = ''
-			}
-			if(response.rows[0].eightStartTime == null){
-				response.rows[0].eightStartTime = ''
-			}
-			six = response.rows[0].sixStartTime
-			six = six + '-' + response.rows[0].sixEndTime
-
-			seven = response.rows[0].sevenStartTime
-			seven = seven + '-' + response.rows[0].sevenStartTime
-			eight = response.rows[0].eightStartTime
-			eight = eight + '-' + response.rows[0].eightEndTime
-			this.classTableData.period[0] = one
-			this.classTableData.period[1] = two
-			this.classTableData.period[2] = three
-			this.classTableData.period[3] = four
-			this.classTableData.period[4] = five
-			this.classTableData.period[5] = six
-			this.classTableData.period[6] = seven
-			this.classTableData.period[7] = eight
+			// one = response.rows[0].oneStartTime
+			// one = one + '-' + response.rows[0].oneEndTime
+			// two = response.rows[0].twoStartTime
+			// two = two + '-' + response.rows[0].twoEndTime
+			// three = response.rows[0].threeStartTime
+			// three  = three + '-' + response.rows[0].threeEndTime
+			// four = response.rows[0].fourStartTime
+			// four = four + '-' + response.rows[0].fourEndTime
+			// five = response.rows[0].fiveStartTime
+			// five = five + '-' + response.rows[0].fiveEndTime
+			// if(response.rows[0].fourStartTime == null){
+			// 	response.rows[0].fourStartTime = ''
+			// }
+			// if(response.rows[0].fourEndTime == null){
+			// 	response.rows[0].fourEndTime = ''
+			// }
+			// if(response.rows[0].fiveStartTime == null){
+			// 	response.rows[0].fiveStartTime = ''
+			// }
+			// if(response.rows[0].fiveEndTime == null){
+			// 	response.rows[0].fiveEndTime = ''
+			// }
+			// if(response.rows[0].sixStartTime == null){
+			// 	response.rows[0].sixStartTime = ''
+			// }
+			// if(response.rows[0].sixEndTime == null){
+			// 	response.rows[0].sixEndTime = ''
+			// }
+			// if(response.rows[0].sevenStartTime == null){
+			// 	response.rows[0].sevenStartTime = ''
+			// }
+			// if(response.rows[0].sevenStartTime == null){
+			// 	response.rows[0].sevenStartTime = ''
+			// }
+			// if(response.rows[0].eightStartTime == null){
+			// 	response.rows[0].eightStartTime = ''
+			// }
+			// if(response.rows[0].eightStartTime == null){
+			// 	response.rows[0].eightStartTime = ''
+			// }
+			// six = response.rows[0].sixStartTime
+			// six = six + '-' + response.rows[0].sixEndTime
+
+			// seven = response.rows[0].sevenStartTime
+			// seven = seven + '-' + response.rows[0].sevenStartTime
+			// eight = response.rows[0].eightStartTime
+			// eight = eight + '-' + response.rows[0].eightEndTime
+			// this.classTableData.period[0] = one
+			// this.classTableData.period[1] = two
+			// this.classTableData.period[2] = three
+			// this.classTableData.period[3] = four
+			// this.classTableData.period[4] = five
+			// this.classTableData.period[5] = six
+			// this.classTableData.period[6] = seven
+			// this.classTableData.period[7] = eight
 
 		  }
-		  console.log(this.classTableData.period,5)
+		  console.log(this.classTableData.period,5)
+      // this.flseg = true
 
 		  // console.log(this.classTableData.period,response.rows[0].oneStartTime + '-' + response.rows[0].oneEndTime)
 	      this.total = response.total;
@@ -2706,9 +2759,8 @@ export default {
 			}
 
 	// console.log()
-	this.nhgetlkd()
-	this.updateData();
-	this.initWeekCourses();
+
+
 	this.flseg = false
 	this.getList()
 	this.getListd()
@@ -2819,8 +2871,8 @@ export default {
 	},
 
 	mjuye(val,data){
-		 console.log(val,data)
-		  console.log(this.fieldCharacterh(val, data))
+		 console.log(val,data,9)
+		  console.log(this.fieldCharacterhtimeFrame(val, data))
 		 this.kch = this.fieldCharacterh(val, data)
 		 this.row = val
 		 if(val == 0){
@@ -2840,10 +2892,12 @@ export default {
 		 }
 		 this.cshue = this.cshue + 1
 		 if(this.cshue == 1){
-		 	 this.forme.subject = this.fieldCharacterh(val, data)
+		 	 this.forme.subject = this.fieldCharacterh(val, data)
+       this.forme.isFrame =  this.fieldCharacterhtimeFrame(val, data)
 		 }else if(this.cshue == 2){
 			 // 被
-		 	this.forme.beSubject = this.fieldCharacterh(val, data)
+		 	this.forme.beSubject = this.fieldCharacterh(val, data)
+      this.forme.beIsFrame = this.fieldCharacterhtimeFrame(val, data)
 		 }
 
 	},
@@ -3073,7 +3127,7 @@ export default {
 				     this.classTableData.weekCourse[weekIndex].courses[courseIndex].index === courseIndex + 1
 				 ) {
 				 				   // console.log(this.classTableData.weekCourse,this.classTableData.weekCourse[weekIndex],this.classTableData.weekCourse[weekIndex].courses[courseIndex],this.classTableData.weekCourse[weekIndex].courses[courseIndex].index,courseIndex + 14)
-				 				   console.log(this.classTableData.weekCourse[weekIndex].courses[courseIndex].title)
+				 				   // console.log(this.classTableData.weekCourse[weekIndex].courses[courseIndex].title)
 				     return this.classTableData.weekCourse[weekIndex].courses[courseIndex].title;
 				 }else{
 					 console.log(37)
@@ -3082,7 +3136,27 @@ export default {
 
 			   // }
 
-           },
+           },
+        fieldCharacterhtimeFrame(weekIndex, courseIndex) {
+        // if(this.flseg == true){
+        if (
+            this.classTableData.weekCourse[weekIndex]
+            &&
+            this.classTableData.weekCourse[weekIndex].courses[courseIndex]
+            &&
+            this.classTableData.weekCourse[weekIndex].courses[courseIndex].index === courseIndex + 1
+        ) {
+        				   // console.log(this.classTableData.weekCourse,this.classTableData.weekCourse[weekIndex],this.classTableData.weekCourse[weekIndex].courses[courseIndex],this.classTableData.weekCourse[weekIndex].courses[courseIndex].index,courseIndex + 14)
+        				   // console.log(this.classTableData.weekCourse[weekIndex].courses[courseIndex].title)
+            return this.classTableData.weekCourse[weekIndex].courses[courseIndex].timeFrame;
+        }else{
+        					 console.log(37)
+        					 // return '-';
+        }
+
+        // }
+
+          },
 		   fieldCharacters(weekIndex, courseIndex) {
 			   // if(this.flseg == true){
 				if (
@@ -3968,7 +4042,7 @@ export default {
 	 justify-content: center;
 	 align-items: center;
 	 padding: 0 10px;
-	 margin-bottom: 15px;
+	 margin-bottom: 30px;
 	 // flex-direction: column;
 	 // padding-bottom: 25px;
 	  cursor:pointer;

ruoyi-ui/src/views/login.vue

@@ -6,12 +6,12 @@
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
       <h3 class="title" v-if='!xgmemberMe'>用户登录<span></span></h3>
 	    <h3 class="title" v-if='xgmemberMe' style="margin-bottom: 40px;">找回密码<span></span></h3>
-      <el-form-item prop="tenantId" v-if="tenantEnabled">
+      <!-- <el-form-item prop="tenantId" v-if="tenantEnabled">
        <el-select v-model="loginForm.tenantId" filterable placeholder="请选择/输入学校名称" style="width: 100%">
           <el-option v-for="item in tenantList" :key="item.tenantId" :label="item.companyName" :value="item.tenantId"></el-option>
           <template #prefix><svg-icon icon-class="company" class="el-input__icon input-icon" /></template>
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
 	  <el-form-item prop="username" v-if='!xgmemberMe'>
         <el-input
           v-model="loginForm.username"
@@ -28,6 +28,7 @@
           type="password"
           auto-complete="off"
           placeholder="密码"
+          show-password
           @keyup.enter.native="handleLogin"
         >
           <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
@@ -57,7 +58,7 @@
        </el-input>
       </el-form-item>
 	  <el-form-item  prop="passwordxm" v-if='xgmemberMe' style="margin-bottom: 27px;">
-	    <el-input v-model="loginForm.passwordxm"  placeholder="新密码"  >
+	    <el-input v-model="loginForm.passwordxm"  show-password placeholder="新密码"  >
 	      <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
 	    </el-input>
 	  </el-form-item>
@@ -140,7 +141,6 @@ export default {
         rememberMe: false,
         code: "",
         uuid: "",
-		tenantId:'000000'
       },
       loginRules: {
         username: [
@@ -204,9 +204,9 @@ export default {
       const username = Cookies.get("username");
       const password = Cookies.get("password");
       const rememberMe = Cookies.get('rememberMe')
-	  const tenantId = Cookies.get('tenantId')
+	  // const tenantId = Cookies.get('tenantId')
       this.loginForm = {
-		tenantId: tenantId === undefined ? this.loginForm.tenantId : tenantId,
+		// tenantId: tenantId === undefined ? this.loginForm.tenantId : tenantId,
         username: username === undefined ? this.loginForm.username : username,
         password: password === undefined ? this.loginForm.password : decrypt(password),
         rememberMe: rememberMe === undefined ? false : Boolean(rememberMe)
@@ -218,12 +218,12 @@ export default {
           this.loading = true;
 		  // this.loginForm.tenantId = '000000'
           if (this.loginForm.rememberMe) {
-			Cookies.set("tenantId", this.loginForm.tenantId, { expires: 30 });
+			// Cookies.set("tenantId", this.loginForm.tenantId, { expires: 30 });
             Cookies.set("username", this.loginForm.username, { expires: 30 });
             Cookies.set("password", encrypt(this.loginForm.password), { expires: 30 });
             Cookies.set('rememberMe', this.loginForm.rememberMe, { expires: 30 });
           } else {
-			Cookies.remove("tenantId");
+			// Cookies.remove("tenantId");
             Cookies.remove("username");
             Cookies.remove("password");
             Cookies.remove('rememberMe');
@@ -410,8 +410,8 @@ export default {
   // margin-left: 300px;
 }
 .title {
-  // 10px  47
-  margin: 10px auto 40px auto;
+  // 10px  44
+  margin: 44px auto 40px auto;
   text-align: center;
   font-size: 24px;
   font-family: PingFang SC;
@@ -467,7 +467,8 @@ export default {
 
   }
   .el-form-item{
-    margin-bottom: 27px;
+    // 有学校选择27  无 37
+     margin-bottom: 37px;
   }
 }
 .login-tip {

ruoyi-ui/src/views/zhihuixy/change/index.vue

@@ -70,15 +70,15 @@
           />
         </el-select>
       </el-form-item>
-     
+
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8" style=" border-top-left-radius: 12px; border-top-right-radius: 12px; background-color: #fff;margin: 0;margin-top: 20px;padding: 10px 5px; ">
-    <p class="bgtan" style="margin-top: 0;">调课信息</p> 
+    <el-row :gutter="10" class="mb8" style=" margin: 0;margin-top: 20px;padding: 10px 5px; ">
+    <p class="bgtan" style="margin-top: 0;">调课信息</p>
 	 <!-- <el-col :span="1.5">
         <el-button
           type="primary"
@@ -100,7 +100,7 @@
           v-hasPermi="['course:change:edit']"
         >修改</el-button>
       </el-col> -->
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="danger"
           plain
@@ -120,16 +120,113 @@
           @click="handleExport"
           v-hasPermi="['course:change:export']"
         >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      </el-col> -->
+      <!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
     </el-row>
-   <div style="background-color: #fff; padding: 0 10px; padding-bottom: 30px; border-bottom-left-radius: 12px; border-bottom-right-radius: 12px;">
+
+    <div v-if="changeList.length !=0">
+      <el-row :gutter="10">
+        <el-col :span="6" v-for="(item,index) in changeList" :key="idnex" v-if="changeList.length !=0">
+           <div style="background: #FFFFFF;border-radius: 4px;">
+             <div style="border-bottom: 1px solid #DADADA;" class="ingweflq">
+               <div>
+                 <span></span>
+                 <p>{{item.subjectClass ==null? '暂无数据' : item.subjectClass}}</p>
+               </div>
+                <img src="../../../assets/images/pic_xyht_tksj_zt_ty.png" alt="">
+             </div>
+
+             <div class="tiaonge">
+                <div class="ingwlka">
+                  <p style="width: 50%;"><span  class="ogtwo">调课科目：</span>
+                   <el-tooltip class="item" effect="dark" :content="item.subject" placement="top-start">
+                  <span class="isap" style="width: 40%;">
+                   {{item.subject ==null? '暂无数据' : item.subject}}
+                   </span>
+                     </el-tooltip>
+                   </p>
+                  <p class="ignlq" style="width: 50%;"><span style="" class="ogtwo">被调科目：</span>
+                  <el-tooltip class="item" effect="dark" :content="item.beSubject" placement="top-start">
+                  <span class="isap" style="width: 40%;">
+                   {{item.beSubject ==null? '暂无数据' : item.beSubject}}
+                   </span>
+                     </el-tooltip>
+                  </p>
+                </div>
+                <p>
+                <span>调课周几：<span class="isap">{{item.subjectWeek ==null? '暂无数据' : item.subjectWeek}}</span></span>
+                </p>
+                <p>
+                  <span>被调课周几：</span>
+                  <span class="isap">{{item.week ==null? '暂无数据' : item.week}}</span>
+                </p>
+                <p>
+                  <span>调课时间：</span>
+                  <span class="isap">{{item.subjectTime ==null? '暂无数据' : item.subjectTime}}({{item.isFrame=='AM'?'上午' : item.isFrame=='PM'?'下午' : '晚上'}})</span>
+                </p>
+                <p>
+                  <span>被调时间：</span>
+                  <span class="isap">{{item.beSubjectTime ==null? '暂无数据' : item.beSubjectTime}}({{item.beIsFrame=='AM'?'上午' : item.beIsFrames=='PM'?'下午' : '晚上'}})</span>
+                </p>
+                <p>
+                  <span>申请时间：</span>
+                  <span class="isap">{{item.applyTime ==null? '暂无数据' : item.applyTime}}</span>
+                </p>
+                <div class="ingwlka">
+                  <p style="width: 50%;"><span  class="ogtwo">申{{"\xa0\xa0"}}请{{"\xa0"}}人：</span>
+                   <el-tooltip class="item" effect="dark" :content="item.applyName" placement="top-start">
+                  <span class="isap" style="width: 40%;">
+                   {{item.applyName ==null? '暂无数据' : item.applyName}}
+                   </span>
+                     </el-tooltip>
+                   </p>
+                  <p class="ignlq" style="width: 50%;">申{{"\xa0\xa0"}}核{{"\xa0"}}人：
+                  <el-tooltip class="item" effect="dark" :content="item.auditUser" placement="top-start">
+                  <span class="isap" style="width: 40%;">
+                   {{item.auditUser ==null? '暂无数据' : item.auditUser}}
+                   </span>
+                     </el-tooltip>
+                  </p>
+                </div>
+                 <p><span>内容描述：</span>
+                 <span class="isap">{{item.content ==null? '暂无数据' : item.content}}</span>
+                 </p>
+                 <p>
+                   <span>审核意见：</span>
+                  <span class="isap">{{item.opinion ==null? '暂无数据' : item.opinion}}</span></p>
+             </div>
+             <div class="tonwbb">
+              <p style="color: #5F8BF4;"    @click="getPass(item)"v-if="item.isPass == 1"  v-hasPermi="['course:change:reply']">同意</p>
+              <p style="color: #FF6969;" @click="getPass(item)" v-if="item.isPass == 1"  v-hasPermi="['course:change:reply']">不同意</p>
+              <p style="color: #00B034;"  @click="handleUpdate(item)"v-hasPermi="['course:change:edit']" v-if="item.isPass == 1">修改</p>
+              <p style="color: #FF6969;" @click="handleDelete(item)" v-hasPermi="['course:change:remove']">删除</p>
+             </div>
+           </div>
+        </el-col>
+
+
+
+      </el-row>
+      <div style="background-color: #fff; padding-bottom: 15px;">
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
+      </div>
+    </div>
+    <div v-if="infoList.length ==0" style="text-align: center;margin: 40px 0;">
+       <img src="../../../assets/images/pic_xyht_zwsj.png" alt="">
+    </div>
+
+   <!-- <div style="background-color: #fff; padding: 0 10px; padding-bottom: 30px; border-bottom-left-radius: 12px; border-bottom-right-radius: 12px;">
 	<el-table border :max-height="tableMaxHeight" v-loading="loading" :data="changeList" @selection-change="handleSelectionChange">
 	  <el-table-column type="selection" width="55" align="center" />
-	 <!-- <el-table-column label="调课班级id" align="center" prop="subjectClassId" /> -->
-	  <el-table-column label="调课班级" align="center" prop="subjectClass" />
-	  <el-table-column label="调课科目" align="center" prop="subject"/>
-	  <el-table-column label="被调科目" align="center" prop="beSubject" />
+	  <el-table-column label="调课班级" align="center" prop="subjectClass"  width="120"/>
+	  <el-table-column label="调课科目" align="center" prop="subject"  width="120"/>
+	  <el-table-column label="被调科目" align="center" prop="beSubject"  width="120"/>
 	  <el-table-column label="调课周几" align="center" prop="subjectWeek" width="120">
 	    <template slot-scope="scope">
 			<div style="display: flex;justify-content: center; text-align: center; width: 100%;">
@@ -155,31 +252,31 @@
 	      <span>{{ scope.row.beSubjectTime}}</span>
 	    </template>
 	  </el-table-column>
-	  <el-table-column label="结果" align="center" prop="isPass">
+	  <el-table-column label="结果" align="center" prop="isPass" width="100">
 	    <template slot-scope="scope">
 	      <dict-tag :options="dict.type.tkchand" :value="scope.row.isPass"/>
 	    </template>
 	  </el-table-column>
-	  <el-table-column label="申请人" align="center" prop="applyName" />
+	  <el-table-column label="申请人" align="center" prop="applyName"  width="100"/>
 	  <el-table-column label="申请时间" align="center" prop="applyTime" width="180">
 	    <template slot-scope="scope">
 	      <span>{{ scope.row.applyTime}}</span>
 	    </template>
 	  </el-table-column>
-	  <el-table-column label="审核人" align="center" prop="auditUser" />
-	  <el-table-column label="审核意见" align="center" prop="opinion" />
+	  <el-table-column label="审核人" align="center" prop="auditUser" width="100"/>
+	  <el-table-column label="审核意见" align="center" prop="opinion"  width="100"/>
 	  <el-table-column label="内容描述" align="center" prop="content" width="100" show-overflow-tooltip/>
-	  <!-- <el-table-column label="备注" align="center" prop="remark" /> -->
+	  <el-table-column label="备注" align="center" prop="remark" />
 	  <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width" width="180">
 	    <template slot-scope="scope">
-	      <!-- <el-button
+	      <el-button
 	        size="mini"
 	        type="text"
 	        icon="el-icon-edit"
 	        @click="handleUpdate(scope.row)"
 	        v-hasPermi="['course:change:edit']"
-			v-if="nike == scope.row.applyName"
-	      >修改</el-button> -->
+
+	      >修改</el-button>
 	      <el-button
 	        size="mini"
 	        type="text"
@@ -193,27 +290,25 @@
 			v-if="scope.row.isPass == 1"
 		    v-hasPermi="['course:change:edit']"
 		  >同意</el-button>
-		  <!--  -->
 		  <el-button
 		    size="mini" type="text" style="background: #3FBCEF;color: #FFF;padding: 7px;"
 		    @click="infoBtn(scope.row)"
 		    v-hasPermi="['course:change:edit']"
 			v-if="scope.row.isPass == 1"
 		  >不同意</el-button>
-		  <!-- v-if="scope.row.isPass == 1" -->
 	    </template>
 	  </el-table-column>
 	</el-table>
-	
+
 	<pagination
 	  v-show="total>0"
 	  :total="total"
 	  :page.sync="queryParams.pageNum"
 	  :limit.sync="queryParams.pageSize"
 	  @pagination="getList"
-	/>   
-   </div>
-    
+	/>
+   </div> -->
+
 
     <!-- 添加或修改调课对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="1200px" append-to-body>
@@ -243,7 +338,7 @@
 			  	        :value="dict.label"
 			  	      ></el-option>
 			  	    </el-select>
-			  	  </el-form-item>			  
+			  	  </el-form-item>
 			  </el-col>
 			  <el-col :span="8">
 			  		<el-form-item label="被调科目" prop="beSubject">
@@ -255,7 +350,7 @@
 			  		      :value="dict.label"
 			  		    ></el-option>
 			  		  </el-select>
-			  		</el-form-item>		  
+			  		</el-form-item>
 			  </el-col>
 			  <el-col :span="8">
 			  		<el-form-item label="周几" prop="week">
@@ -267,12 +362,12 @@
 			  		      :value="dict.value"
 			  		    ></el-option>
 			  		  </el-select>
-			  		</el-form-item>		  
+			  		</el-form-item>
 			  </el-col>
 			  <el-col :span="8">
 			  		<el-form-item label="内容描述">
 						<el-input v-model="form.content" type="textarea" placeholder="请输入内容" />
-			  		</el-form-item>		  
+			  		</el-form-item>
 			  </el-col>
 			  <el-col :span="8">
 				  <el-form-item label="备注" prop="remark">
@@ -283,8 +378,8 @@
         <!-- <el-form-item label="调课班级id" prop="subjectClassId">
           <el-input v-model="form.subjectClassId" placeholder="请输入调课班级id" />
         </el-form-item> -->
-       
-        
+
+
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -324,7 +419,7 @@ export default {
       // 查询参数
       queryParams: {
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 8,
         applyId: null,
         applyName: null,
         applyTime: null,
@@ -369,9 +464,9 @@ export default {
 	this.nike = this.$store.state.user.nickName
     this.getList();
 	this.getdept(0)
-	
+
 	// console.log(this.$store.state.user,4)
-	
+
   },
   mounted() {
   	window.onresize = () => {
@@ -389,7 +484,7 @@ export default {
 	  			  if(rou.children != undefined){
 	  			  	rou.children.filter(rour =>{
 	  			  		this.kiuesegh.push(rour)
-	  			  	})		  
+	  			  	})
 	  			  }
 	  			  // this.kiuesegh = rou.children
 	  			  // this.kiuesegh.push(rou.children)
@@ -398,7 +493,7 @@ export default {
 	  		  this.kiueseghs = this.kiuesegh
 	  		  // this.deptOptions = response.data
 	  		  console.log(this.kiuesegh)
-	  		});  
+	  		});
 	  },
     /** 查询调课列表 */
     getList() {
@@ -553,7 +648,7 @@ export default {
 	           beSubject:row.beSubject,
 	            opinion:value
 	          });
-	
+
 	      })
 	      .then(({ value }) => {
 	       _this.getList();
@@ -565,7 +660,7 @@ export default {
 	      this.filterActive = !this.filterActive
 	      this.changeTableMaxHeight()
 	    },
-	
+
 	    changeTableMaxHeight () {
 	      let height = document.body.offsetHeight // 网页可视区域高度
 	      // if (this.filterActive) {
@@ -580,11 +675,94 @@ export default {
 </script>
 
 <style scoped lang="scss">
+
+  .ingweflq{
+   display: flex;
+   align-items: center;
+   justify-content: space-between;
+   div{
+    display: flex;
+    align-items: center;
+   }
+   p{
+     font-family: PingFang SC;
+     font-weight: 800;
+     font-size: 16px;
+     color: #161616;
+   }
+   span{
+      width: 8px;
+      height: 8px;
+      background: #4775EA;
+      border-radius: 50%;
+      margin-left: 15px;
+      margin-right: 10px;
+   }
+   img{
+     width: 70px;
+     height: 30px;
+   }
+  }
+  .tiaonge{
+    padding: 20px 15px;
+    p{
+      margin: 0;
+      line-height: 29px;
+      display: flex;
+      span{
+        font-weight: bold;
+        font-size: 14px;
+        color: #161616;
+      }
+    }
+    .isap{
+
+      color: #606266;
+      font-weight: 400;
+       white-space: nowrap;      /* 确保文本在一行内显示 */
+       overflow: hidden;         /* 隐藏溢出的内容 */
+      text-overflow: ellipsis;
+    }
+    .ingwlka{
+      display: flex;
+      justify-content: space-between;
+      .ogtwo{
+        font-weight: bold;
+        font-size: 14px;
+        color: #161616;
+      }
+      .ignlq{
+        font-weight: bold;
+        font-size: 14px;
+        color: #161616;
+      }
+      span{
+        font-size: 14px;
+        color: #161616;
+        color: #606266;
+        font-weight: 400;
+      }
+
+    }
+  }
+  .tonwbb{
+    p{
+      margin: 0;
+      cursor: pointer;
+    }
+    height: 40px;
+    line-height: 40px;
+    border-top: 1px  solid #DADADA;
+    display: flex;
+    justify-content: space-around;
+  }
+
+
 	.bgtan{
 		border-left: 3px solid #4775EA;
 		padding-left: 10px;
 	}
-	
+
 	.app-container{
 		background-color: #f6f6f6;
 		// height: 100vh;

ruoyi-ui/src/views/zhihuixy/infor/index.vue

@@ -262,7 +262,7 @@
 	 </div>
 
    <!-- <div style="margin-top: 17px; display: flex;justify-content: flex-start;align-items: center;flex-wrap: wrap;"> -->
-     <el-row :gutter="20" style="margin: 0;margin-top: 17px; ">
+     <el-row :gutter="20" style="margin: 0;margin-top: 17px; " v-if="infoList.length !=0" >
        <el-col :span="6"  v-for="(item,index) in infoList" :key="index">
         <div style="background-color: #fff;border-radius: 4px;padding: 15px;padding-bottom: 0; margin-bottom: 16px;">
           <div class="tongty">
@@ -296,7 +296,7 @@
 
 
    <!-- </div> -->
-   <div style="padding: 20px ; background-color: #fff; padding-top: 1px;" class="ingwe">
+   <div style="padding: 20px ; background-color: #fff; padding-top: 1px;" class="ingwe" v-if="infoList.length !=0">
      <pagination
        v-show="total>0"
        :total="total"
@@ -305,6 +305,11 @@
        @pagination="getList"/>
    </div>
 
+   <div v-if="infoList.length ==0" style="text-align: center;margin: 40px 0;">
+      <img src="../../../assets/images/pic_xyht_zwsj.png" alt="">
+   </div>
+
+
 
     <!-- 添加或修改注册-老师-班级（学科）对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="97%" append-to-body>
@@ -809,7 +814,7 @@ export default {
       // 查询参数
       queryParams: {
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 8,
         studentId: null,
         name: null,
         sex: null,

ruoyi-ui/src/views/zhihuixy/school/index.vue

@@ -99,9 +99,11 @@
 		  <el-table-column label="审核人" align="center" prop="auditUser" />
 		  <el-table-column label="审核结果" align="center" prop="isPass">
 		    <template slot-scope="scope">
+           <el-tooltip class="item" effect="dark" content="点击查看详情" placement="top-start">
           <div @click="handleUpdateg(scope.row)">
             <dict-tag  :options="dict.type.shhjg" :value="scope.row.isPass"/>
           </div>
+          </el-tooltip>
 		    </template>
 		  </el-table-column>
 		  <el-table-column label="审核意见" align="center" prop="opinion" />
@@ -112,7 +114,7 @@
 		        size="mini"
 		        type="text"
 		        @click="handleUpdate(scope.row)"
-				v-if="scope.row.isPass == 1"
+				v-if="scope.row.isPass != 2"
 				style="background: #00B034;color: #FFF;padding: 7px;"
 		        v-hasPermi="['register:school:edit']"
 		      >修改</el-button>
@@ -160,7 +162,7 @@
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
         </el-form-item> -->
 		<el-form-item label="附件" prop="remark">
-		   <file-upload v-model="form.registerSchoolFileList"/>
+		   <file-uploadsch v-model="form.registerSchoolFileList"/>
 		</el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">

ruoyi-ui/src/views/zhihuixy/student/index.vue

@@ -11,7 +11,7 @@
 			     clearable
 			     @keyup.enter.native="handleQuery"
 			   />
-			 </el-form-item> 
+			 </el-form-item>
 		  </el-col>
 		  <el-col :span="8">
 		  		<el-form-item label="班级名称" prop="classId">
@@ -25,7 +25,7 @@
 		  		  	@keyup.enter.native="handleQuery"
 		  		    ></el-option>
 		  		  </el-select>
-		  		</el-form-item>	  
+		  		</el-form-item>
 		  </el-col>
 		  <el-col :span="8">
 		  		<el-form-item label="姓名" prop="studentName">
@@ -34,8 +34,8 @@
 		  		    placeholder="请输入姓名"
 		  		    clearable
 		  		    @keyup.enter.native="handleQuery"
-		  		  /> 
-		  		</el-form-item>	  
+		  		  />
+		  		</el-form-item>
 		  </el-col>
 		  <el-col :span="8">
 		  		<el-form-item label="学号" prop="studentNumber">
@@ -45,7 +45,7 @@
 		  		    clearable
 		  		    @keyup.enter.native="handleQuery"
 		  		  />
-		  		</el-form-item>	  
+		  		</el-form-item>
 		  </el-col>
 		  <el-col :span="8">
 		  		<el-form-item label="审核结果" prop="isPass">
@@ -55,16 +55,16 @@
 		  		    clearable
 		  		    @keyup.enter.native="handleQuery"
 		  		  />
-		  		</el-form-item>	  
+		  		</el-form-item>
 		  </el-col>
 		  <el-col :span="8">
 			 <el-form-item>
 			   <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
 			   <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-			 </el-form-item> 
+			 </el-form-item>
 		  </el-col>
 	  </el-row>
-	  
+
      <!-- <el-form-item label="学校id" prop="schoolId">
         <el-input
           v-model="queryParams.schoolId"
@@ -89,11 +89,11 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item> -->
-      
-      
-      
-      
-      
+
+
+
+
+
     </el-form>
 
     <el-row :gutter="10" class="mb8" style=" border-top-left-radius: 12px; border-top-right-radius: 12px; background-color: #fff;margin: 0;margin-top: 20px;padding: 10px 5px; ">
@@ -142,7 +142,7 @@
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
-    
+
 	<div style="background-color: #fff; padding: 0 10px; padding-bottom: 30px; border-bottom-left-radius: 12px; border-bottom-right-radius: 12px;">
 	<el-table border :max-height="tableMaxHeight" v-loading="loading" :data="studentList" @selection-change="handleSelectionChange">
 	  <el-table-column type="selection" width="55" align="center" />
@@ -155,7 +155,7 @@
 	  <el-table-column label="姓名" align="center" prop="studentName" />
 	  <el-table-column label="学号" align="center" prop="studentNumber" />
 	   <el-table-column label="联系方式" align="center" prop="parentsPhone" width="120"/>
-	  
+
 	  <el-table-column label="审核人" align="center" prop="auditUser" />
 	  <el-table-column label="审核结果" align="center" prop="isPass">
 	    <template slot-scope="scope">
@@ -164,39 +164,40 @@
 	  </el-table-column>
 	  <el-table-column label="审核意见" align="center" prop="opinion" />
 	  <el-table-column label="备注" align="center" prop="remark" />
-	  <el-table-column label="操作"  width="160" align="center" class-name="small-padding fixed-width">
+	  <el-table-column label="操作" width="140" align="center" class-name="small-padding fixed-width">
 	    <template slot-scope="scope">
-	      <!-- <el-button
+	      <el-button
 	        size="mini"
 	        type="text"
-	        icon="el-icon-edit"
 	        @click="handleUpdate(scope.row)"
+	  	v-if="scope.row.isPass != 2"
+	  	style="background: #00B034;color: #FFF;padding: 7px;"
 	        v-hasPermi="['register:student:edit']"
-	      >修改</el-button> -->
-					<el-button size="mini" type="text" style="background: #00B034;color: #FFF;padding: 7px;" v-hasPermi="['audit:shyj:add']"
-					    @click="getPass(scope.row)" v-if="scope.row.isPass == 1">审核</el-button>
-					  <el-button size="mini" type="text" style="background: #3FBCEF;color: #FFF;padding: 7px;" v-hasPermi="['audit:shyj:add']"
-					    @click="infoBtn(scope.row)" v-if="scope.row.isPass == 1">驳回</el-button>
+	      >修改</el-button>
+	  			<el-button size="mini" type="text" style="background: #00B034;color: #FFF;padding: 7px; margin-bottom: 5px;" v-hasPermi="['audit:shyj:add']"
+	  			    @click="getPass(scope.row)" v-if="scope.row.isPass == 1">审核</el-button>
+	  			  <el-button size="mini" type="text" style="background: #3FBCEF;color: #FFF;padding: 7px; margin-left: 0;" v-hasPermi="['audit:shyj:add']"
+	  			    @click="infoBtn(scope.row)"  v-if="scope.row.isPass == 1">驳回</el-button>
 	      <el-button
 	        size="mini"
 	        type="text"
-	        style="background: red;color: #FFF;padding: 7px;"
+	  	style="background: red;color: #FFF;padding: 7px;"
 	        @click="handleDelete(scope.row)"
 	        v-hasPermi="['register:student:remove']"
 	      >删除</el-button>
 	    </template>
 	  </el-table-column>
 	</el-table>
-	
+
 	<pagination
 	  v-show="total>0"
 	  :total="total"
 	  :page.sync="queryParams.pageNum"
 	  :limit.sync="queryParams.pageSize"
 	  @pagination="getList"
-	/>	
+	/>
 	</div>
-    
+
 
     <!-- 添加或修改注册-家长-学生对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
@@ -317,7 +318,7 @@ export default {
 	  		  })
 	  		  // this.deptOptions = response.data
 	  		  console.log(this.kiuesegh)
-	  		});  
+	  		});
 	  },
     /** 查询注册-家长-学生列表 */
     getList() {
@@ -462,7 +463,7 @@ export default {
 		            dataId: row.id,
 		            shyj:value
 		          });
-		
+
 		      })
 		      .then(({ value }) => {
 		        _this.msgSuccess("驳回成功");
@@ -474,7 +475,7 @@ export default {
 		      this.filterActive = !this.filterActive
 		      this.changeTableMaxHeight()
 		    },
-		
+
 		    changeTableMaxHeight () {
 		      let height = document.body.offsetHeight // 网页可视区域高度
 		      // if (this.filterActive) {
@@ -493,7 +494,7 @@ export default {
 		border-left: 3px solid #4775EA;
 		padding-left: 10px;
 	}
-	
+
 	.app-container{
 		background-color: #f6f6f6;
 		// height: 100vh;

ruoyi-ui/src/views/zhihuixy/teacher/index.vue

@@ -127,24 +127,24 @@
 	     <el-table-column label="审核意见" align="center" prop="opinion" />
 
 	     <el-table-column label="备注" align="center" prop="remark" />
-	     <el-table-column label="操作"   width="160" align="center" class-name="small-padding fixed-width" >
+	     <el-table-column label="操作" width="140" align="center" class-name="small-padding fixed-width">
 	       <template slot-scope="scope">
-	         <!-- <el-button
+	         <el-button
 	           size="mini"
 	           type="text"
-
-	   		style="background: #00B034;color: #FFF;padding: 7px;"
 	           @click="handleUpdate(scope.row)"
+	     	v-if="scope.row.isPass != 2"
+	     	style="background: #00B034;color: #FFF;padding: 7px;"
 	           v-hasPermi="['register:teacher:edit']"
-	         >修改</el-button> -->
-	   				<el-button size="mini" type="text" style="background: #00B034;color: #FFF;padding: 7px;" v-hasPermi="['audit:shyj:add']"
-	   				    @click="getPass(scope.row)" v-if="scope.row.isPass == 1">审核</el-button>
-	   				  <el-button size="mini" type="text" style="background: #3FBCEF;color: #FFF;padding: 7px;" v-hasPermi="['audit:shyj:add']"
-	   				    @click="infoBtn(scope.row)" v-if="scope.row.isPass == 1">驳回</el-button>
+	         >修改</el-button>
+	     			<el-button size="mini" type="text" style="background: #00B034;color: #FFF;padding: 7px; margin-bottom: 5px;" v-hasPermi="['audit:shyj:add']"
+	     			    @click="getPass(scope.row)" v-if="scope.row.isPass == 1">审核</el-button>
+	     			  <el-button size="mini" type="text" style="background: #3FBCEF;color: #FFF;padding: 7px; margin-left: 0;" v-hasPermi="['audit:shyj:add']"
+	     			    @click="infoBtn(scope.row)"  v-if="scope.row.isPass == 1">驳回</el-button>
 	         <el-button
 	           size="mini"
 	           type="text"
-	           style="background: red;color: #FFF;padding: 7px;"
+	     	style="background: red;color: #FFF;padding: 7px;"
 	           @click="handleDelete(scope.row)"
 	           v-hasPermi="['register:teacher:remove']"
 	         >删除</el-button>

ruoyi-ui/src/views/zhihuixy/teacherdan/index.vue

@@ -47,7 +47,7 @@
 							  </el-select>
 					</el-form-item>
 				</el-col>
-				  
+
 				<el-col :span="8">
 					<el-form-item label="职称" prop="professional">
 					        <el-input
@@ -64,30 +64,30 @@
 					  <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
 					</el-form-item>
 				</el-col>
-				
+
 				<el-col :span="6">
-					
+
 				</el-col>
 				<el-col :span="6">
-					
+
 				</el-col>
 				<el-col :span="6">
-					
+
 				</el-col>
 				<el-col :span="6">
-					
+
 				</el-col>
 				<el-col :span="6">
-					
+
 				</el-col>
 				<el-col :span="6">
-					
+
 				</el-col>
-				
-				
+
+
 			</el-row>
-      
-      
+
+
     </el-form>
 
     <el-row :gutter="10" class="mb8" style=" border-top-left-radius: 12px; border-top-right-radius: 12px; background-color: #fff;margin: 0;margin-top: 20px;padding: 10px 5px; ">
@@ -136,11 +136,51 @@
 			  </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
-     <div style="background-color: #fff; padding: 0 10px;  padding-bottom: 40px; border-bottom-left-radius: 12px; border-bottom-right-radius: 12px;">
+    <el-row :gutter="20" style="margin: 0;margin-top: 17px; " v-if="infoList.length !=0">
+      <el-col :span="6"  v-for="(item,index) in infoList" :key="index">
+       <div style="background-color: #fff;border-radius: 4px;padding: 15px;padding-bottom: 0; margin-bottom: 16px;">
+         <div class="tongty">
+           <!-- <img :src=" item.identificationPhoto== null?'../../../assets/images/pic_ryxx_tx_ns.png' : defaultSettings + ijsget+item.identificationPhoto" alt="" style="width: 48px; height: 48px;"> -->
+            <image-preview :src="item.identificationPhoto" :width="48" :height="48"/>
+           <p style="font-weight: bold;font-size: 16px;font-size: 16px;color: #161616;margin-left: 18px;">{{item.name == null?'暂无数据' : item.name == ""? '暂无数据' : item.name }}</p>
+           <span style="font-weight: 500;font-size: 14px;color: #666666;margin-left: 16px;">{{item.age == null?'暂无数据' : item.age == ""? '暂无数据' : item.age }}岁</span>
+           <span style="font-weight: 500;font-size: 14px;color: #666666;margin-left: 7px;">{{item.sex == 1?'男' : '女' }}</span>
+         </div>
+         <div class="psnge">
+           <p style="margin-top: 16px;"><span>{{"身\u2003\u2003高："}}</span> <span> {{item.studentNumber == null?'暂无数据' : item.studentNumber == ""? '暂无数据' : item.studentNumber }}</span></p>
+           <p><span>身份证号：</span> <span>{{item.idCard == null?'暂无数据' : item.idCard == ""? '暂无数据' : item.idCard }}</span></p>
+           <p><span>入职时间：</span> <span>{{item.onBoardTime == null?'暂无数据' : item.onBoardTime == ""? '暂无数据' : item.onBoardTime }}</span></p>
+           <div class="tongty" style="justify-content: space-between;">
+             <p style="overflow: hidden;text-overflow:ellipsis;white-space:nowrap; width: 50%;"><span>政治面貌：</span>
+             <el-tooltip class="item" effect="dark" :content="item.politicalStatus" placement="top-start">
+              <span>{{item.politicalStatus == null?'无数据' : item.politicalStatus == ""? '无数据' : item.politicalStatus }}</span>
+             </el-tooltip>
+              </p>
+             <p style="display: flex;align-items: center; width: 50%;"><span>门禁照片：</span> <image-preview :src="item.entrancePermit" :width="30" :height="30"/></p>
+           </div>
+         </div>
+         <div class="bortt tongty" style="justify-content: space-between;">
+           <p  style="cursor: pointer;"><span @click="handleUpdate(item)">修改</span>  <span @click="handleUpdatech(item)">查看</span></p>
+           <p style="border-left: 1px solid #DADADA;color:red;cursor: pointer;">删除</p>
+         </div>
+       </div>
+      </el-col>
+      <el-col :span="24" style="padding: 5px 0 20px 0; background-color: #fff;">
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
+      </el-col>
+    </el-row>
+    <div v-if="infoList.length ==0" style="text-align: center;margin: 40px 0;">
+       <img src="../../../assets/images/pic_xyht_zwsj.png" alt="">
+    </div>
+     <!-- <div style="background-color: #fff; padding: 0 10px;  padding-bottom: 40px; border-bottom-left-radius: 12px; border-bottom-right-radius: 12px;">
 		<el-table  :max-height="tableMaxHeight"  v-loading="loading" :data="infoList" @selection-change="handleSelectionChange">
 		  <el-table-column type="selection" width="55" align="center" />
-		   <!-- <el-table-column label="班级名称" align="center" prop="className" width="110"/> -->
-		  <!-- <el-table-column label="ID" align="center" prop="id" /> -->
 		  <el-table-column type="expand">
 		        <template slot-scope="props">
 		          <el-form label-position="left" inline class="demo-table-expand">
@@ -165,7 +205,7 @@
 		  					<el-form-item label="职称证明照">
 		  					  <image-preview :src="props.row.degreePhoto" :width="50" :height="50"/>
 		  					</el-form-item>
-		            
+
 		            <el-form-item label="居住地址" >
 		              <span class="ngr">{{ props.row.address }}</span>
 		            </el-form-item>
@@ -176,37 +216,12 @@
 			<el-table-column label="姓名" align="center" prop="name" width="100" />
 			<el-table-column label="联系方式" align="center" prop="phone" width="110"/>
 			<el-table-column label="职称" align="center" prop="professional" width="110"/>
-			<!-- <el-table-column label="学号" align="center" prop="studentNumber" width="120" show-overflow-tooltip/> -->
 		  <el-table-column label="年龄" align="center" prop="age" />
 			<el-table-column label="性别" align="center" prop="sex">
 			        <template slot-scope="scope">
 			          <dict-tag :options="dict.type.xshsex" :value="scope.row.sex"/>
 			        </template>
 			      </el-table-column>
-			<!-- <el-table-column label="政治面貌" align="center" prop="politicalStatus" /> -->
-			<!-- <el-table-column label="居住地址" align="center" prop="address" width="110" show-overflow-tooltip/> -->
-			<!-- <el-table-column label="毕业证明照" align="center" prop="graduationPhoto" width="100">
-			        <template slot-scope="scope">
-			          <image-preview :src="scope.row.graduationPhoto" :width="50" :height="50"/>
-			        </template>
-			      </el-table-column> -->
-			
-			<!-- <el-table-column label="学位证书照" align="center" prop="degreePhoto" width="100">
-			        <template slot-scope="scope">
-			          <image-preview :src="scope.row.degreePhoto" :width="50" :height="50"/>
-			        </template>
-			      </el-table-column>
-			<el-table-column label="教资证明照" align="center" prop="teachingPhoto" width="100">
-			        <template slot-scope="scope">
-			          <image-preview :src="scope.row.teachingPhoto" :width="50" :height="50"/>
-			        </template>
-			      </el-table-column>
-			<el-table-column label="职称证明照" align="center" prop="professionalPhoto" width="100">
-			        <template slot-scope="scope">
-			          <image-preview :src="scope.row.professionalPhoto" :width="50" :height="50"/>
-			        </template>
-			      </el-table-column> -->
-			
 			<el-table-column label="证件照"  align="center" prop="identificationPhoto" width="100">
 			        <template slot-scope="scope">
 			          <image-preview :src="scope.row.identificationPhoto" :width="50" :height="50"/>
@@ -217,13 +232,7 @@
 			          <image-preview :src="scope.row.entrancePermit" :width="50" :height="50"/>
 			        </template>
 			      </el-table-column>
-		  <!-- <el-table-column label="班级id" align="center" prop="classId" /> -->
-		 
-		          <!-- <template slot-scope="scope">
-		            <dict-tag :options="dict.type.sys_subject" :value="scope.row.discipline"/>
-		          </template> -->
-		        <!-- </el-table-column> -->
-		  <!-- <el-table-column label="备注" align="center" prop="remark" /> -->
+
 		  <el-table-column  label="操作" align="center" class-name="small-padding fixed-width" width="120">
 		    <template slot-scope="scope">
 		      <el-button
@@ -243,16 +252,16 @@
 		    </template>
 		  </el-table-column>
 		</el-table>
-		
+
 		<pagination
 		  v-show="total>0"
 		  :total="total"
 		  :page.sync="queryParams.pageNum"
 		  :limit.sync="queryParams.pageSize"
 		  @pagination="getList"
-		/> 
-	 </div>
-    
+		/>
+	 </div> -->
+
 
     <!-- 添加或修改注册-老师-班级（学科）对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="1268px" append-to-body>
@@ -274,9 +283,9 @@
 				  					  </el-select>
 				  </el-form-item> -->
 			</el-col>
-			
+
 			<el-col :span="6">
-				
+
 				 <el-form-item label="班级名称" prop="classId">
 				  <el-select style="width: 100%;" v-model="form.classId" placeholder="请选择班级名称">
 				    <el-option
@@ -301,7 +310,7 @@
 					  ></el-option>
 					</el-select>
 				          <!-- <el-input v-model="form.name" placeholder="请输入姓名" /> -->
-						  
+
 				</el-form-item>
 			</el-col>
 			<el-col :span="6">
@@ -309,7 +318,7 @@
 				          <el-input @blur="idcde" v-model="form.idCard" placeholder="请输入身份证号" />
 				        </el-form-item>
 			</el-col>
-			
+
 			<el-col :span="6">
 				<el-form-item label="年龄" prop="age">
 				          <el-input type="Number" v-model="form.age" placeholder="请输入年龄" />
@@ -337,19 +346,19 @@
 				          <el-input type="Number" v-model="form.phone" placeholder="请输入联系方式" />
 				        </el-form-item>
 			</el-col>
-			
+
 			<el-col :span="6">
 				<el-form-item label="身高(CM)" prop="height">
 				          <el-input v-model="form.height" placeholder="请输入身高" />
 				        </el-form-item>
 			</el-col>
-			
+
 			<el-col :span="6">
 				<el-form-item label="体重(KG)" prop="weight">
 				          <el-input v-model="form.weight" placeholder="请输入体重" />
 				        </el-form-item>
 			</el-col>
-			
+
 			<el-col :span="6">
           <el-form-item label="职称" prop="professional">
 			  <el-select v-model="form.professional" placeholder="请选择职称" clearable>
@@ -363,7 +372,7 @@
           <!-- <el-input v-model="form.professional" placeholder="请输入职称" /> -->
         </el-form-item>
 			</el-col>
-			
+
 			<el-col :span="6">
 			  <el-form-item label="政治面貌" prop="politicalStatus">
 			  <el-select v-model="form.politicalStatus" placeholder="请选择政治面貌">
@@ -416,7 +425,7 @@
 			<el-col :span="6">
 			 <el-form-item label="备注" prop="remark">
 			           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
-			         </el-form-item>	
+			         </el-form-item>
 			</el-col>
 			<el-col :span="24">
 				<el-form-item label="居住地址" prop="address">
@@ -427,7 +436,7 @@
 										 <bm-geolocation anchor="BMAP_ANCHOR_BOTTOM_RIGHT" :showAddressBar="true" :autoLocation="true" @locationSuccess="secc" @locationError="errw"></bm-geolocation>
 						      <!-- <bm-auto-complete v-model="form.address" :sugStyle="{zIndex: 99}"> -->
 						        <!-- <el-input placeholder="请输入地名关键字" v-model="form.address" @blur = "boiu" @focus= "faie"></el-input>  -->
-						       
+
 						      <!-- <search-field placeholder="请输入地名关键字"></search-field>  -->
 						      <!-- 这里指代一个自定义搜索框组件 -->
 						      <!-- </bm-auto-complete> -->
@@ -447,7 +456,7 @@
 				</el-form-item>
 			</el-col>
 			<el-col :span="24">
-				
+
 			</el-col>
 			<el-col :span="24">
 			  <el-col :span="8">
@@ -459,7 +468,7 @@
 			  	<el-form-item label="学位证书照" prop="degreePhoto">
 			  	          <image-uploads v-model="form.degreePhoto"/>
 			  	        </el-form-item>
-			  </el-col>	
+			  </el-col>
 			  <el-col :span="8">
 			  	<el-form-item label="教资证明照" prop="teachingPhoto">
 			  	          <image-uploads v-model="form.teachingPhoto"/>
@@ -467,8 +476,8 @@
 			  </el-col>
 			</el-col>
 			<el-col :spn="24">
-				
-				
+
+
 			</el-col>
 			<el-col :spn="24">
 				<el-col :span="8">
@@ -487,12 +496,12 @@
 					        </el-form-item>
 				</el-col>
 			</el-col>
-			
-			
-			
-			
-			
-			
+
+
+
+
+
+
 		</el-row>
         <!-- <el-form-item label="班级id" prop="classId">
           <el-input v-model="form.classId" placeholder="请输入班级id" />
@@ -541,7 +550,7 @@ export default {
       // 查询参数
       queryParams: {
         pageNum: 1,
-                pageSize: 10,
+                pageSize: 8,
                 teacherId: null,
                 name: null,
                 sex: null,
@@ -600,10 +609,12 @@ export default {
 	   longit: '', // 经度
 	   latit: '',  // 纬度
 	   ak:'Bjardsym8W1tLv0PmOAVfCosOLIiFdKX',
-	   ferg:false
+	   ferg:false,
+
     };
   },
   created() {
+
 		window.onresize = () => {
 		          this.changeTableMaxHeight()
 		        }
@@ -617,10 +628,10 @@ export default {
 		// this.$nextTick(function () {
 		//       //写入自己的ak
 		//       MP(this.ak).then(BMap => {
-		// 		// cons			   
+		// 		// cons
 		//         //在此调用api
 		//         this.lib_getPosition()//这是我自定义的
-		
+
 		//       })
 		//     })
 		 window.onresize = () => {
@@ -633,7 +644,7 @@ export default {
 	        //Toast("如长时间未获取办理区域请手动选择");
 	        myBMap.init().then(() => {
 	          let that = this;
-	          let geolocation = new BMap.Geolocation(); 
+	          let geolocation = new BMap.Geolocation();
 	          // 创建百度地理位置实例，代替 navigator.geolocation
 	          geolocation.getCurrentPosition(function (e) {
 	            if (this.getStatus() == BMAP_STATUS_SUCCESS) {
@@ -653,8 +664,8 @@ export default {
 	      },
 
 	  getMap () {
-	      // 先定义that = this   
-	    var that = this   
+	      // 先定义that = this
+	    var that = this
 	    // 生成地图
 	    var map = new window.AMap.Map('container', {
 	      resizeEnable: true,
@@ -667,7 +678,7 @@ export default {
 	      rotateEnable: false, // 地图是否可旋转，3D视图默认为true，2D视图默认false
 	      viewMode: '3D'
 	    })
-	  
+
 	    // 获取到当前位置的定位
 	    AMap.plugin('AMap.Geolocation', function() {
 	      var geolocation = new AMap.Geolocation({
@@ -686,7 +697,7 @@ export default {
 	                pName: "Geolocation",
 
 	      })
-	  
+
 	      geolocation.getCurrentPosition()
 	      AMap.event.addListener(geolocation, 'complete', onComplete)
 	      AMap.event.addListener(geolocation, 'error', onError)
@@ -694,21 +705,21 @@ export default {
 	      function onComplete (data) {
 	        // data是具体的定位信息
 	        console.log('data是具体的定位信息', data)
-	  
+
 	        // 这里使用that而不是this，如果使用this，则无法在其他地方获取到这里的经纬度
 	        that.longit = data.position.lng
 	        that.latit = data.position.lat
 	      }
 	       function onError (data) {
-			   
+
 	         // 定位出错
 	         console.log('定位失败',data)
 			 // that.$nextTick(function () {
 			 //       //写入自己的ak
-				//    console.log('data是具体的定位信息')	
+				//    console.log('data是具体的定位信息')
 			      MP(that.ak).then(BMap => {
 			      	var map = new BMap.Map('allmap');
-			      	// const BMap = window.BMapGL; 
+			      	// const BMap = window.BMapGL;
 			      	// const AMap = new window.AMap;
 			      	const BMapGeolocation = new BMap.Geolocation();
 			      	BMapGeolocation.getCurrentPosition( (r) => {
@@ -721,8 +732,8 @@ export default {
 			      	    // 根据经纬度获取当前经纬度的位置信息
 			      				  console.log(r,r.latitude,r.longitude)
 			      	    // that.getAdd();
-						
-						
+
+
 						const geocoder = new AMap.Geocoder({
 						  radius: 1000,
 						  extensions: "all",
@@ -748,8 +759,8 @@ export default {
 			      	});
 			      })
 			 //     })
-			 
-			
+
+
 			 // that.lib_getPosition();
 	       }
 	    })
@@ -762,12 +773,12 @@ export default {
 	  /**
 	     * 百度地图获取经纬度
 	     */
-		
+
 	    lib_getPosition() {
 	      const that = this;
 		  console.log(23)
 		  var map = new BMap.Map('allmap');
-	      // const BMap = window.BMapGL; 
+	      // const BMap = window.BMapGL;
 		  // const AMap = new window.AMap;
 	      const BMapGeolocation = new BMap.Geolocation();
 	      BMapGeolocation.getCurrentPosition( (r) => {
@@ -784,7 +795,7 @@ export default {
 	        }
 	      });
 	    },
-	  
+
 	  /**
 	     * 根据经纬度获取地址
 	     */
@@ -824,7 +835,7 @@ export default {
 		 },
 
 
-	  
+
 	  /** 查询老师档案信息列表 */
 	  getListuye(val) {
 	    this.loading = true;
@@ -844,7 +855,7 @@ export default {
 	  			  if(rou.children != undefined){
 	  			  	rou.children.filter(rour =>{
 	  			  					  this.kiuesegh.push(rour)
-	  			  	})		  
+	  			  	})
 	  			  }
 	  			  // this.kiuesegh = rou.children
 	  			  // this.kiuesegh.push(rou.children)
@@ -853,7 +864,7 @@ export default {
 	  		  this.kiueseghs = this.kiuesegh
 	  		  // this.deptOptions = response.data
 	  		  console.log(this.kiuesegh)
-	  		});  
+	  		});
 	  },
     /** 查询学生档案信息列表 */
     getList() {
@@ -932,6 +943,15 @@ export default {
         this.open = true;
         this.title = "修改老师档案信息";
       });
+    },
+    // 查看
+    handleUpdatech(row){
+     this.$router.push({
+       path: '/danga/teacherdanme',
+     		query: {
+     			'id':row.id,
+     		}
+     })
     },
 	// 身份证
 	idcde(event) {
@@ -968,7 +988,7 @@ export default {
 	          this.$message.error('证件格式不正确');
 	        }
 	      }
-	
+
 	    }
 		}
 	},
@@ -980,14 +1000,14 @@ export default {
 		        let month = myDate.getMonth() + 1;
 		        let day = myDate.getDate();
 		        let age = 0;
-		
+
 		        if (idCard.length === 18) {
 		          age = myDate.getFullYear() - idCard.substring(6, 10) - 1;
 		          sex = idCard.substring(16, 17);
 		          birth = idCard.substring(6, 10) + "-" + idCard.substring(10, 12) + "-" + idCard.substring(12, 14);
 		          if (idCard.substring(10, 12) < month || idCard.substring(10, 12) === month && idCard.substring(12, 14) <= day)
 		            age++;
-		
+
 		        }
 		        if (idCard.length === 15) {
 		          age = myDate.getFullYear() - idCard.substring(6, 8) - 1901;
@@ -996,7 +1016,7 @@ export default {
 		          if (idCard.substring(8, 10) < month || idCard.substring(8, 10) === month && idCard.substring(10, 12) <= day)
 		            age++;
 		        }
-		
+
 		        if (sex % 2 === 0) sex = '2';
 		        else sex = '1';
 				this.form.sex = sex
@@ -1011,7 +1031,7 @@ export default {
 	// idea() {
 	// 	idces({ idCard: this.form.idCard }).then(response => {
 	// 		console.log(response);
-			
+
 	// 	});
 	// },
     /** 提交按钮 */
@@ -1021,14 +1041,14 @@ export default {
 		} else{
 		  if(this.form.phone !== ''){
 		    if(redw.test(this.form.phone)){
-		
+
 		    }else{
 		      this.$message.error('手机号码不正确');
 		      return false
 		    }
 		  }
 		}
-		
+
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
@@ -1065,16 +1085,16 @@ export default {
     },
 	handleChange (value) {
 	        console.log(3976);
-	        
+
 	      //我们选择地址后，selectedOptions 会保存对应的区域码，例如北京的区域码为'110000'
 	      //我们要取出区域码对应的汉字，就需要用CodeToText(区域码)进行输出
 	        this.addtions.selectedOptions = value
 	        console.log(this.selectedOptions);
-	        
+
 	        var name = ''
-	
+
 	        this.selectedOptions.map(item => name += CodeToText[item] + '/')
-	        this.addtions.names = name  
+	        this.addtions.names = name
 	        this.namestwo = this.addtions.names.split('/')
 	        // for (let index = 0; index < this.namestwo.length; index++) {
 	        //   const element = this.namestwo[index];
@@ -1082,7 +1102,7 @@ export default {
 	        //    this.form.cityName.value = this.namestwo[1]
 	        //    this.form.regionName.value = this.namestwo[2]
 	        //    console.log(this.form);
-	           
+
 	        // }
 	        this.form.area = this.addtions.names.split('/')
 	        this.form.areaCode = this.addtions.selectedOptions
@@ -1093,11 +1113,11 @@ export default {
 	        }
 	        console.log(this.mapCenter);
 	        console.log(this.location);
-	        
-	        
+
+
 	         console.log(this.form.areaCode);
 	        console.log(this.addtions.names.split('/'))
-	
+
 	        console.log(this.addtions.selectedOptions)
 	      },
 	      // 、、地图
@@ -1125,20 +1145,20 @@ export default {
 		    //          } else {
 		    //            addr += addrComponent.streetNumber
 		    //          }
-					 
+
 		    //          that.choosedLocation = { province, city, district, addr, ...that.center }
 		           })
 	      },
 	      searchcomplete(e){
 	        console.log(e);
-	        
+
 	      },
 	      handlerBMap({ BMap, map }) {
 	      this.BMap = BMap
 	      this.map = map
 	      console.log(BMap,map);
 	      console.log(this.mapLocatio);
-	      
+
 	      // if (this.mapLocation.coordinate && this.mapLocation.coordinate.lng) {
 	      //   // this.mapCenter.lng = this.mapLocation.coordinate.lng
 	      //   // this.mapCenter.lat = this.mapLocation.coordinate.lat
@@ -1157,11 +1177,11 @@ export default {
 	      // var that = this
 	      // var myGeo = new this.BMap.Geocoder()
 	      // console.log(queryString, cb);
-	      
+
 	      // myGeo.getPoint(queryString, function(point) {
 	      //   console.log(point);
 	      //   // var point = '安庆市'
-	        
+
 	      //   if (point) {
 	      //     that.mapLocation.coordinate = point
 	      //     that.makerCenter(point)
@@ -1170,28 +1190,28 @@ export default {
 	      //   }
 	      // }, this.locationCity)
 	      // console.log(this.locationCity);
-	      
+
 	      // var options = {
 	      //   onSearchComplete: function(results) {
 	      //     console.log(local.getStatus());
-	          
+
 	      //     if (local.getStatus() === 0) {
 	      //       // 判断状态是否正确
 	      //       var s = []
 	      //       console.log(results.getCurrentNumPois());
-	            
+
 	      //       for (var i = 0; i < results.getCurrentNumPois(); i++) {
 	      //         var x = results.getPoi(i)
 	      //         console.log(x);
-	              
+
 	      //         var item = { value: x.address + x.title, point: x.point }
 	      //         s.push(item)
 	      //         // console.log(s);
-	              
+
 	      //         cb(s)
 	      //       }
 	      //       // console.log(s);
-	            
+
 	      //     } else {
 	      //       cb()
 	      //     }
@@ -1208,11 +1228,11 @@ export default {
 	        // if(queryString[i].address == undefined){
 	        //     queryString[i].address = ''
 	        // }
-	        //  x= this.nameadd[i].address + this.nameadd[i].title 
+	        //  x= this.nameadd[i].address + this.nameadd[i].title
 	        // item.push(x)
-	       this.nameadd[i].value = this.nameadd[i].address + this.nameadd[i].title 
+	       this.nameadd[i].value = this.nameadd[i].address + this.nameadd[i].title
 	       console.log(this.nameadd[i].value);
-	       
+
 	      //  this.nameadd.push( item)
 	         }
 	        //  this.nameadd = item
@@ -1221,17 +1241,17 @@ export default {
 	      cb(this.nameadd)
 	      if(this.nameadd.length != 0){
 	        // console.log(local.getStatus());
-	       
+
 	      }else{
 	        cb(this.kdourg)
 	      }
-	       
+
 	      console.log(this.nameadd);
-	      
+
 	      // }
 	      // console.log(options );
 	    // var local = new this.BMap.LocalSearch('安庆市', options)
-	    
+
 	    // console.log(queryString );
 	      // local.search(queryString)
 	    },
@@ -1242,7 +1262,7 @@ export default {
 		  this.form.latitude = this.mapLocation.coordinate.lat
 	      console.log(this.mapLocation.coordinate);
 		  this.ferg = true
-	      
+
 	      // this.makerCenter(point)
 	    },
 		handleSelectb(item){
@@ -1258,14 +1278,14 @@ export default {
 					        }
 					      });
 			// }
-			
-			
+
+
 
 			console.log(this.form.address,396);
 		},
 	    makerCenter(point) {
 	      console.log(point);
-	      
+
 	      if (this.map) {
 	        this.map.clearOverlays()
 	        this.map.addOverlay(new this.BMap.Marker(point))
@@ -1279,8 +1299,8 @@ export default {
 	    //  console.log(results,cb);
 	   console.log(results);
 	   console.log(this.form.address);
-	
-	
+
+
 	    // if(this.form.address == ''){
 	    //   this.nameadd = []
 	    // }else{
@@ -1291,18 +1311,18 @@ export default {
 	    //  var cb= cb
 	     this.querySearch(this.nameadd,this.cb)
 	    //  results,cb
-	     
+
 	    //  this.nameadd.
 	    //  var local = new this.BMap.LocalSearch(this.map, options)
 	    //   local.search(queryString)
-	     
+
 	    },
 	    //选中数据
 	    confirmf(e){
 	      console.log(143);
 	      console.log(e);
 	      this.nameadd = e
-	      
+
 	    },
 	    boiu(){
 	      // this.okuyt = false
@@ -1330,7 +1350,7 @@ export default {
 		      this.filterActive = !this.filterActive
 		      this.changeTableMaxHeight()
 		    },
-		
+
 		    changeTableMaxHeight () {
 		      let height = document.body.offsetHeight // 网页可视区域高度
 		      // if (this.filterActive) {
@@ -1345,6 +1365,48 @@ export default {
 </script>
 
 <style>
+  .ingwe{
+    margin-top: 0;
+  }
+	.el-drawer__body{
+		padding: 0 10px;
+	}
+	.el-card__body, .el-main{
+		padding:10px;
+		/* margin-bottom:10px; */
+	}
+	.el-divider--horizontal{
+		margin:7px 0;
+	}
+	.text {
+	    font-size: 14px;
+	  }
+
+	  .item {
+	    /* padding: 10px 0; */
+	  }
+	  .item p {
+		  margin:0;
+		  color:#161616;
+		  margin-bottom:5px;
+	  }
+	  .item p span{
+		  color:#aaa;
+		  /* padding-left:5px; */
+		  margin-right:5px;
+	  }
+
+	  .box-card {
+	    width: 100%;
+		margin-bottom:10px;
+	  }
+	.ngtes .el-table .el-dropdown-link, .el-table .el-dropdown-selfdefine{
+		margin-left:0;
+	}
+	.ngtes .el-button+.el-button, .el-checkbox.is-bordered+.el-checkbox.is-bordered{
+		margin-right:5px;
+		margin-left:5px;
+	}
   .demo-table-expand {
     font-size: 0;
 	.ngr{
@@ -1364,16 +1426,41 @@ export default {
 </style>
 
 <style scoped lang="scss">
-	// 去除百度地图的图标 根据实际情况看是否要加样式穿透(::v-deep)
-	    ::v-deep .anchorBL {
-	      display: none !important;
-	    }
-	
+  .psnge{
+    p{
+      margin: 0;
+      padding-left: 10px;
+      span{
+        font-weight: 500;
+        font-size: 14px;
+        color: #606266;
+        line-height: 24px;
+      }
+    }
+  }
+  .tongty{
+    display: flex;
+    align-items: center;
+  }
+  .bortt{
+    border-top: 1px solid #DADADA;
+    margin-top: 15px;
+
+    p{
+      margin: 0;
+      font-weight: bold;
+      font-size: 14px;
+      color: #5F8BF4;
+      width:50%;
+      padding: 10px;
+      text-align: center;
+    }
+  }
 	.bgtan{
 		border-left: 3px solid #4775EA;
 		padding-left: 10px;
 	}
-	
+
 	.app-container{
 		background-color: #f6f6f6;
 		// height: 100vh;
@@ -1406,4 +1493,8 @@ export default {
 	  width: 100%;
 	  height: 300px;
 	}
+	// 去除百度地图的图标 根据实际情况看是否要加样式穿透(::v-deep)
+	    ::v-deep .anchorBL {
+	      display: none !important;
+	    }
 </style>

ruoyi-ui/src/views/zhihuixy/teacherdanme/index.vue

@@ -474,10 +474,19 @@ export default {
 	   latit: '',  // 纬度
 	   ak:'Bjardsym8W1tLv0PmOAVfCosOLIiFdKX',
 	   ferg:false,
-     ignes:{}
+     ignes:{},
+     isgwe:false,
+     itwid:0
     };
   },
   created() {
+    if(this.$route.query.id == undefined){
+       this.isgwe = false
+    }else{
+      this.isgwe = true
+      this.itwid = this.$route.query.id
+    }
+
 		window.onresize = () => {
 		          this.changeTableMaxHeight()
 		        }
@@ -735,9 +744,40 @@ export default {
       this.loading = true;
       listInfo(this.queryParams).then(response => {
         this.infoList = response.rows;
-        if(this.infoList.length != 0){
-          this.ignes = this.infoList[0]
+        if(this.isgwe == false){
+          if(this.infoList.length != 0){
+            this.ignes = this.infoList[0]
+          }else{
+            this.ignes = {teacherId: null,
+                name: null,
+                sex: null,
+                age: null,
+                phone: null,
+                professional: null,
+                idCard: null,
+                height: null,
+                weight: null,
+                bloodType: null,
+                politicalStatus: null,
+                graduationPhoto: null,
+                degreePhoto: null,
+                teachingPhoto: null,
+                professionalPhoto: null,
+                identificationPhoto: null,
+                entrancePermit: null,
+                address: null,
+                createBy: null,
+                createTime: null,
+                updateBy: null,
+                updateTime: null,
+                remark: null}
+          }
+        }else{
+          getInfo(this.itwid).then(response => {
+            this.ignes = response.data;
+          });
         }
+
         console.log( this.ignes,92)
         this.total = response.total;
         this.loading = false;

ruoyi-ui/src/views/zhihuixy/time/index.vue

@@ -29,9 +29,10 @@
           icon="el-icon-delete"
           size="mini"
           @click="handleDelete"
-          v-hasPermi="['course:time:remove']"
+
         >清空</el-button>
       </el-col>
+       <!-- v-hasPermi="['course:time:remove']" -->
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -42,7 +43,7 @@
           v-hasPermi="['course:time:export']"
         >导出</el-button>
       </el-col>
-      <el-col :span="19" style="text-align: right;">
+      <!-- <el-col :span="19" style="text-align: right;">
           <el-button
             type="primary"
             plain
@@ -51,15 +52,15 @@
             @click="submitForm"
             v-hasPermi="['course:time:add']"
           >确定修改</el-button>
-        </el-col>
+        </el-col> -->
       <!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
     </el-row>
 
-    <el-form ref="form" :model="form" :rules="rules" label-width="100px" style="background-color: #fff;">
+    <el-form ref="form" :model="form" :rules="rules" label-width="120px" style="background-color: #fff;">
     <el-row>
       <el-col :span="24">
     	  <el-col :span="12">
-        <el-form-item label="学校名称" prop="schoolId">
+        <el-form-item label="学校名称" >
          					    <!-- <treeselect v-model="form.parentId" :options="deptOptions" :normalizer="normalizer" placeholder="选择上级部门" /> -->
          					  <el-select  style="width: 80%;"   v-model="form.schoolId" placeholder="请选择学校名称">
          					    <el-option
@@ -73,175 +74,102 @@
         </el-form-item>
         </el-col>
       </el-col>
-      <el-col :span="12">
-      	<el-form-item label="第一节课" prop="oneStartTime">
-      	  <el-time-picker
-          style="width: 80%;"
-      	      v-model="form.oneStartTime"
-    		  @change="nhyesefr"
-    		  value-format="HH:mm"
-      	      placeholder="选择第一节课开始时间">
-      	    </el-time-picker>
-      	</el-form-item>
-      </el-col>
-      <el-col :span="12">
-      	<el-form-item label="第一节课" prop="oneEndTime">
-      	  <el-time-picker clearable
-          style="width: 80%;"
-      	    v-model="form.oneEndTime"
-      	    value-format="HH:mm"
-      	    placeholder="请选择第一节课结束时间">
-      	  </el-time-picker>
-      	</el-form-item>
-      </el-col>
-      <el-col :span="12">
-      	<el-form-item label="第二节课" prop="twoStartTime">
-      	  <el-time-picker clearable
-          style="width: 80%;"
-      	    v-model="form.twoStartTime"
-      	    value-format="HH:mm"
-      	    placeholder="请选择第二节课开始时间">
-      	  </el-time-picker>
-      	</el-form-item>
+      <el-col :span="24" style="padding-left: 5px;">
+       <p class="bgtan" style="margin-top: 0;font-weight: bold;font-size: 15px;color: #4775EA;display: flex;justify-content: space-between;align-items: center;padding-right: 30px;"><span>上午上课时间配置<span style="color: red;">*</span></span>
+         <span style="color: #4775EA;margin-left: 20px;display: flex;align-items: center;" @click="shangwuxin">
+            <img style="width: 16px; height: 16px;margin-right: 5px;" src="../../../assets/images/icon_kcgl_ht_add.png" alt="" >
+           新增课程
+          </span>
+       </p>
       </el-col>
-      <el-col :span="12">
-      	<el-form-item label="第二节课" prop="twoEndTime">
-      	  <el-time-picker clearable
-          style="width: 80%;"
-      	    v-model="form.twoEndTime"
-      	    el-time-picker
-      	    value-format="HH:mm"
-      	    placeholder="请选择第二节课结束时间">
-      	  </el-time-picker>
-      	</el-form-item>
-      </el-col>
-      <el-col :span="12">
-      	<el-form-item label="第三节课" prop="threeStartTime">
-      	  <el-time-picker clearable
-          style="width: 80%;"
-      	    v-model="form.threeStartTime"
-      	    value-format="HH:mm"
-      	    placeholder="请选择第三节课开始时间">
-      	  </el-time-picker>
-      	</el-form-item>
-      </el-col>
-      <el-col :span="12">
-    	  <el-form-item label="第三节课" prop="threeEndTime">
-    	   <el-time-picker clearable
-         style="width: 80%;"
-    	     v-model="form.threeEndTime"
-    	     value-format="HH:mm"
-    	     placeholder="请选择第三节课结束时间">
-    	   </el-time-picker>
-    	  </el-form-item>
+      <el-col :span="24" v-for="(item,index) in shangwu" :key="index">
+        <el-col :span="12">
+        	<el-form-item :label="'上午第'+ (index+1) + '节课'" >
+        	  <el-time-picker
+            style="width: 80%;"
+        	      v-model="item.startTime"
+        	  value-format="HH:mm"
+        	      placeholder="开始时间">
+        	    </el-time-picker>
+        	</el-form-item>
+        </el-col>
+        <el-col :span="10" style="position: relative;" >
+        	<el-form-item :label="'上午第'+ (index+1) + '节课'"  >
+        	  <el-time-picker clearable
+            style="width: 80%;"
+        	    v-model="item.endTime"
+        	    value-format="HH:mm"
+        	    placeholder="请选择第一节课结束时间">
+        	  </el-time-picker>
+        	</el-form-item>
+         <img @click="shangwudel(index)" style="width: 16px; height: 16px;position: absolute;right: 30px;top:10px;" src="../../../assets/images/icon_qjlb_del.png" alt="" >
+        </el-col>
 
       </el-col>
-      <el-col :span="12">
-      	<el-form-item label="第四节课" prop="fourStartTime">
-      	  <el-time-picker clearable
-          style="width: 80%;"
-      	    v-model="form.fourStartTime"
-
-      	    value-format="HH:mm"
-      	    placeholder="请选择第四节课开始时间">
-      	  </el-time-picker>
-      	</el-form-item>
+      <el-col :span="24" style="padding-left: 5px;">
+       <p class="bgtan" style="margin-top: 0;font-weight: bold;font-size: 15px;color: #4775EA;display: flex;justify-content: space-between;align-items: center;padding-right: 30px;"><span>下午上课时间配置<span style="color: red;">*</span></span>
+         <span style="color: #4775EA;margin-left: 20px;display: flex;align-items: center;" @click="xiawuxin">
+            <img style="width: 16px; height: 16px;margin-right: 5px;" src="../../../assets/images/icon_kcgl_ht_add.png" alt="" >
+           新增课程
+          </span>
+       </p>
       </el-col>
-      <el-col :span="12">
-      	<el-form-item label="第四节课" prop="fourEndTime">
-      	  <el-time-picker clearable
-      	    v-model="form.fourEndTime"
+      <el-col :span="24" v-for="(item,index) in xiawu" :key="index + 'b'">
+        <el-col :span="12">
+        	<el-form-item :label="'下午第'+ (index+1) + '节课'" >
+        	  <el-time-picker
             style="width: 80%;"
-      	    value-format="HH:mm"
-      	    placeholder="请选择第四节课结束时间">
-      	  </el-time-picker>
-      	</el-form-item>
-      </el-col>
-      <el-col :span="12">
-      	<el-form-item label="第五节课" prop="fiveStartTime">
-      	  <el-time-picker clearable
-      	    v-model="form.fiveStartTime"
+        	      v-model="item.startTime"
+        	  value-format="HH:mm"
+        	      placeholder="开始时间">
+        	    </el-time-picker>
+        	</el-form-item>
+        </el-col>
+       <el-col :span="10" style="position: relative;" >
+       	<el-form-item :label="'下午第'+ (index+1) + '节课'" >
+       	  <el-time-picker clearable
            style="width: 80%;"
-      	    value-format="HH:mm"
-      	    placeholder="请选择第五节课开始时间">
-      	  </el-time-picker>
-      	</el-form-item>
-      </el-col>
-      <el-col :span="12">
-      	<el-form-item label="第五节课" prop="fiveEndTime">
-      	  <el-time-picker clearable
-      	    v-model="form.fiveEndTime"
-             style="width: 80%;"
-      	    value-format="HH:mm"
-      	    placeholder="请选择第五节课结束时间">
-      	  </el-time-picker>
-      	</el-form-item>
-      </el-col>
-      <el-col :span="12">
-      	<el-form-item label="第六节课" prop="sixStartTime">
-      	  <el-time-picker clearable
-          style="width: 80%;"
-      	    v-model="form.sixStartTime"
-
-      	    value-format="HH:mm"
-      	    placeholder="请选择第六节课开始时间">
-      	  </el-time-picker>
-      	</el-form-item>
-      </el-col>
-      <el-col :span="12">
-      	<el-form-item label="第六节课" prop="sixEndTime">
-      	  <el-time-picker clearable
-          style="width: 80%;"
-      	    v-model="form.sixEndTime"
-
-      	    value-format="HH:mm"
-      	    placeholder="请选择第六节课结束时间">
-      	  </el-time-picker>
-      	</el-form-item>
-      </el-col>
-      <el-col :span="12">
-      	<el-form-item label="第七节课" prop="sevenStartTime">
-      	  <el-time-picker clearable
-          style="width: 80%;"
-      	    v-model="form.sevenStartTime"
-
-      	    value-format="HH:mm"
-      	    placeholder="请选择第七节课开始时间">
-      	  </el-time-picker>
-      	</el-form-item>
+       	    v-model="item.endTime"
+       	    value-format="HH:mm"
+       	    placeholder="请选择第一节课结束时间">
+       	  </el-time-picker>
+       	</el-form-item>
+        <img @click="xiawudel(index)" style="width: 16px; height: 16px;position: absolute;right: 30px;top:10px;" src="../../../assets/images/icon_qjlb_del.png" alt="" >
+       </el-col>
       </el-col>
-      <el-col :span="12">
-      	<el-form-item label="第七节课" prop="sevenEndTime">
-      	  <el-time-picker clearable
-          style="width: 80%;"
-      	    v-model="form.sevenEndTime"
-
-      	    value-format="HH:mm"
-      	    placeholder="请选择第七节课结束时间">
-      	  </el-time-picker>
-      	</el-form-item>
+      <el-col :span="24" style="padding-left: 5px;">
+      <p class="bgtan" style="margin-top: 0;font-weight: bold;font-size: 15px;color: #4775EA;display: flex;justify-content: space-between;align-items: center;padding-right: 30px;"><span>晚自习上课时间配置<span style="color: red;">*</span></span>
+        <span style="color: #4775EA;margin-left: 20px;display: flex;align-items: center;" @click="wanzixixin">
+           <img style="width: 16px; height: 16px;margin-right: 5px;" src="../../../assets/images/icon_kcgl_ht_add.png" alt="" >
+          新增课程
+         </span>
+      </p>
       </el-col>
-      <el-col :span="12">
-      	<el-form-item label="第八节课" prop="eightStartTime">
-      	  <el-time-picker clearable
-          style="width: 80%;"
-      	    v-model="form.eightStartTime"
-      	    value-format="HH:mm"
-      	    placeholder="请选择第八节课开始时间">
-      	  </el-time-picker>
-      	</el-form-item>
-      </el-col>
-      <el-col :span="12">
-      	<el-form-item label="第八节课" prop="eightEndTime">
-      	  <el-time-picker clearable
-          style="width: 80%;"
-      	    v-model="form.eightEndTime"
-
-      	    value-format="HH:mm"
-      	    placeholder="请选择第八节课结束时间">
-      	  </el-time-picker>
-      	</el-form-item>
+      <el-col :span="24" v-for="(item,index) in wanzixi" :key="index + 'a'">
+        <el-col :span="12">
+        	<el-form-item :label="'晚自习第'+ (index+1) + '节课'" >
+        	  <el-time-picker
+            style="width: 80%;"
+        	      v-model="item.startTime"
+        	  value-format="HH:mm"
+        	      placeholder="开始时间">
+        	    </el-time-picker>
+        	</el-form-item>
+        </el-col>
+       <el-col :span="10" style="position: relative;" >
+       	<el-form-item :label="'晚自习第'+ (index+1) + '节课'"  >
+       	  <el-time-picker clearable
+           style="width: 80%;"
+       	    v-model="item.endTime"
+       	    value-format="HH:mm"
+       	    placeholder="请选择第一节课结束时间">
+       	  </el-time-picker>
+       	</el-form-item>
+        <img @click="wanzixidel(index)" style="width: 16px; height: 16px;position: absolute;right: 30px;top:10px;" src="../../../assets/images/icon_qjlb_del.png" alt="" >
+       </el-col>
       </el-col>
+
+
       <el-col :span="24">
       	<el-form-item label="备注" prop="remark">
       	  <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
@@ -249,7 +177,7 @@
       </el-col>
     </el-row>
     </el-form>
-    <div slot="footer" class="dialog-footer">
+    <div slot="footer" class="dialog-footer" style="text-align: center;margin-top:10px;">
       <el-button type="primary" @click="submitForm">确 定</el-button>
       <el-button @click="cancel">取 消</el-button>
     </div>
@@ -617,15 +545,31 @@ export default {
 		          ],
 
       },
-	  deptOptions:[]
+      shangwu:[
+        {classNumber:null,timeFrame:'AM',endTime:null,startTime:null},
+        {classNumber:null,timeFrame:'AM',endTime:null,startTime:null},
+        {classNumber:null,timeFrame:'AM',endTime:null,startTime:null},
+        ],
+      xiawu:[
+        {classNumber:null,timeFrame:'PM',endTime:null,startTime:null},
+        {classNumber:null,timeFrame:'PM',endTime:null,startTime:null},
+        {classNumber:null,timeFrame:'PM',endTime:null,startTime:null},
+        ],
+      wanzixi:[
+        {classNumber:null,timeFrame:'TM',endTime:null,startTime:null},
+        {classNumber:null,timeFrame:'TM',endTime:null,startTime:null},
+        {classNumber:null,timeFrame:'TM',endTime:null,startTime:null},
+        ],
+	  deptOptions:[],
+    ishge:false
     };
   },
   created() {
-	  this.queryParams.schoolId = this.$store.state.user.schoolId - 0
+	  // this.queryParams.schoolId = this.$store.state.user.schoolId - 0
 	  console.log(this.roleqh(),28)
-
+   this.getdept()
     this.getList();
-	this.getdept()
+
   },
   methods: {
 	  getdept(){
@@ -633,6 +577,10 @@ export default {
 	  		  // this.kiuesegh = []
 	  		listDept(kuesf).then(response => {
 	  		  this.deptOptions = this.handleTree(response.data, "deptId");
+          if(this.deptOptions.length !=0){
+            this.form.schoolId = this.deptOptions[0].deptId
+            this.form.schoolName = this.deptOptions[0].deptName
+          }
 	  		});
 	  },
     /** 查询课程-时间列表 */
@@ -641,8 +589,43 @@ export default {
       listTime(this.queryParams).then(response => {
         this.timeList = response.rows;
         if(response.rows.length != 0){
-          this.form = response.rows[0]
+          let nhd=[]
+          let xis=[]
+          let wan=[]
+          this.ishge = true
+          for(var i = 0; i < response.rows.length; i++){
+            this.form.schoolId = response.rows[i].schoolId
+            this.form.schoolName = response.rows[i].schoolName
+            if(response.rows[i].timeFrame == 'AM'){
+              response.rows[i].id = undefined
+             nhd.push(response.rows[i])
+            }
+            if(response.rows[i].timeFrame == 'PM'){
+              response.rows[i].id = undefined
+              xis.push(response.rows[i])
+            }
+            if(response.rows[i].timeFrame == 'TM'){
+              response.rows[i].id = undefined
+              wan.push(response.rows[i])
+            }
+            // console.log(response.rows[i])
+          }
+          if(nhd.length != 0){
+            this.shangwu = nhd
+          }
+          if(xis.length != 0){
+            this.xiawu = xis
+          }
+          if(wan.length != 0){
+            this.wanzixi = wan
+          }
+          // console.log(response.rows,nhd)
+          // this.shangwu
+          // this.form = response.rows[0]
+        }else{
+           this.ishge = false
         }
+        // console.log(this.shangwu)
         this.total = response.total;
         this.loading = false;
       });
@@ -717,8 +700,37 @@ export default {
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {
+        // console.log(this.form,34)
         if (valid) {
-          if (this.form.id != null) {
+           this.form.courseTableTimeBoList= []
+           for(var i=0; i < this.shangwu.length; i++){
+             this.shangwu[i].classNumber = i+1
+             if(this.shangwu[i].startTime != null ){
+               if(this.shangwu[i].startTime != ''){
+                 this.form.courseTableTimeBoList.push(this.shangwu[i])
+               }
+             }
+
+           }
+           for(var a=0; a < this.xiawu.length; a++){
+             this.xiawu[a].classNumber = a+1
+             if(this.xiawu[a].startTime != null ){
+               if(this.xiawu[a].startTime != ''){
+                 this.form.courseTableTimeBoList.push(this.xiawu[a])
+               }
+             }
+           }
+           for(var b=0; b < this.wanzixi.length; b++){
+             this.wanzixi[b].classNumber = b+1
+             if(this.wanzixi[b].startTime != null ){
+               if(this.wanzixi[b].startTime != '' ){
+                 console.log(this.wanzixi[b])
+                 this.form.courseTableTimeBoList.push(this.wanzixi[b])
+               }
+             }
+           }
+           console.log(this.form.courseTableTimeBoList,this.wanzixi,34)
+          if (this.ishge == true) {
             updateTime(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
@@ -742,7 +754,8 @@ export default {
         this.$modal.msgSuccess("数据已清空");
       }
       // const ids = row.id || this.ids;
-	   delTime(ids).then(response => {
+      let gew={'schoolId':this.form.schoolId}
+	   delTime(gew).then(response => {
 	   this.getList();
 	   this.$modal.msgSuccess("删除成功");
 	  });
@@ -766,6 +779,25 @@ export default {
 		console.log(val,this.form.schoolName)
 		this.form.schoolName = val.deptName
 	},
+  shangwuxin(){
+    this.shangwu.push({classNumber:null,timeFrame:'AM',endTime:null,startTime:null},)
+  },
+  xiawuxin(){
+    this.xiawu.push({classNumber:null,timeFrame:'PM',endTime:null,startTime:null},)
+  },
+  wanzixixin(){
+   this.wanzixi.push({classNumber:null,timeFrame:'TM',endTime:null,startTime:null},)
+  },
+  shangwudel(index){
+   this.shangwu.splice(index,1)
+  },
+  xiawudel(index){
+    this.xiawu.splice(index,1)
+  },
+  wanzixidel(index){
+   this.wanzixi.splice(index,1)
+   console.log(this.wanzixi)
+  }
   }
 };
 </script>
@@ -777,6 +809,6 @@ export default {
 
 	.app-container{
 		background-color: #f6f6f6;
-		height: 100vh;
+		height: 180vh;
 	}
 </style>

ruoyi-ui/src/views/zhihuixy/yijianfk/index.vue

@@ -64,7 +64,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <div style="background-color: #fff;padding:20px 15px 15px 15px;">
+    <div style="background-color: #fff;padding:20px 15px 15px 15px;" v-if="schoolList.length !=0">
       <el-row :gutter="20">
         <el-col :span="6" v-for="(item,index) in schoolList " :key="index" style="margin-bottom: 15px;">
           <div style="background: #FFFFFF;box-shadow: 0px 0px 10px 0px #CDCDCD;border-radius: 4px;">
@@ -96,6 +96,10 @@
       />
     </div>
 
+    <div v-if="schoolList.length ==0" style="text-align: center;margin: 40px 0;">
+       <img src="../../../assets/images/pic_xyht_zwsj.png" alt="">
+    </div>
+
     <!-- <div style="background-color: #fff; padding: 0 10px; padding-bottom: 30px; border-bottom-left-radius: 12px; border-bottom-right-radius: 12px;">
 		<el-table border :max-height="tableMaxHeight" v-loading="loading" :data="schoolList" @selection-change="handleSelectionChange">
 		  <el-table-column type="selection" width="55" align="center" />
@@ -170,7 +174,7 @@ export default {
       // 查询参数
       queryParams: {
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 8,
         schoolName: null,
         userName: null,
         userPhone: null,