Skip to content

D
dd_zhxy
Commit fc732f08 by peijy
Options

9.14 全部代码提交

parent 93f0e7e0
Showing with 6815 additions and 400 deletions
components.d.ts
...@@ -10,6 +10,7 @@ declare module '@vue/runtime-core' { ...@@ -10,6 +10,7 @@ declare module '@vue/runtime-core' {
My_switch: typeof import('./src/components/my_switch.vue')['default'] My_switch: typeof import('./src/components/my_switch.vue')['default']
RouterLink: typeof import('vue-router')['RouterLink'] RouterLink: typeof import('vue-router')['RouterLink']
RouterView: typeof import('vue-router')['RouterView'] RouterView: typeof import('vue-router')['RouterView']
SchoolYear: typeof import('./src/components/schoolYear.vue')['default']
Tabbar: typeof import('./src/components/tabbar.vue')['default'] Tabbar: typeof import('./src/components/tabbar.vue')['default']
VanActionSheet: typeof import('vant/es')['ActionSheet'] VanActionSheet: typeof import('vant/es')['ActionSheet']
VanButton: typeof import('vant/es')['Button'] VanButton: typeof import('vant/es')['Button']
......
src/assets/style/common.css
...@@ -37,3 +37,24 @@ ...@@ -37,3 +37,24 @@
border-radius: 8px; border-radius: 8px;
box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1); box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
} }
.topTitle{
font-size: 16px;
color: #1989fa;
font-weight: bold;
margin: 20px 0px 10px 20px;
}
.schoolYearNew{
font-size:12px;
width: 165px;
height: 30px;
margin-top: 5px;
margin-left: 20px;
border: 1px solid silver;
border-radius: 5px
}
.van-cell.van-field.schoolYearNew{
padding: 0px!important;
height: 30px;
line-height: 30px;
}
src/components/schoolYear.vue 0 → 100644
<template>
<!--学年/学期 -->
<div>
<van-field
clearable
class="schoolYearNew"
v-model="schoolYearResult"
readonly
name="picker"
placeholder="学年/学期(默认最新)"
@click="showPicker = true"
/>
<van-popup v-model:show="showPicker" position="bottom">
<van-picker title="标题" :columns="columns" @confirm="onConfirm"
@cancel="showPicker = false"/>
</van-popup>
</div>
</template>
<script setup>
import {getNewSchoolYear,getSchoolYear} from '@/service/laboratoryManagement'
import {reactive, defineEmits, onMounted, ref} from "vue";
import {useStore} from "vuex";
import {Toast} from "vant";
const store = useStore()
// 定义事件驱动
const emits = defineEmits(['select'])
//学年学期选择器
const schoolYearResult = ref('');
console.log('schoolYearResult',schoolYearResult.value)
const showPicker = ref(false);
const onConfirm = (value) => {
console.log('schoolYearResult',schoolYearResult.value)
emits("select",value)
console.log('value',value)
schoolYearResult.value = value[0] + '-' + value[1] ;
showPicker.value = false;
};
// const columns = [
// // 第一列
// {
// values: ['周一', '周二', '周三', '周四', '周五'],
// defaultIndex: 0,
// },
// // 第二列
// {
// values: ['上学期', '下学期'],
// defaultIndex: 0,
// },
// ];
const columns = ref([]);
onMounted(async () => {
const data = {
userId:store.state.userInfo.userId
}
console.log('data',data)
let schoolYear = await getSchoolYear(data);
console.log('schoolYear',schoolYear);
if(schoolYear.code == 200){
const schoolYearColumns =schoolYear.data.map(item => {
return item.schoolYear
})
console.log('schoolYearColumns',schoolYearColumns)
columns.value = [{values:schoolYearColumns},{values: ['上学期', '下学期'],}]
}
let result = await getNewSchoolYear();
console.log('result1',result)
if(result.code == 200){
// schoolYearResult.value = [result.schoolYear,columns[1].values[result.semester-1]]
schoolYearResult.value = result.schoolYear + '-' + columns.value[1].values[result.semester-1]
const value = [result.schoolYear,result.semester]
emits("select",value)
console.log('emits',value)
}else{
Toast("获取信息失败!");
}
})
</script>
<style scoped>
.schoolYearNew{
font-size:12px;
width: 165px;
height: 30px;
margin-top: 5px;
margin-left: 20px;
border: 1px solid silver;
border-radius: 5px
}
.van-cell.van-field.schoolYearNew{
padding: 0px!important;
height: 30px;
line-height: 30px;
}
</style>
src/components/tabbar.vue
...@@ -48,6 +48,7 @@ ...@@ -48,6 +48,7 @@
import { ref, toRefs, onMounted } from "vue"; import { ref, toRefs, onMounted } from "vue";
import { defineProps } from "vue"; import { defineProps } from "vue";
import { getTotyp } from "@/utils/auth"; import { getTotyp } from "@/utils/auth";
import { Toast } from "vant";
const props = defineProps({ const props = defineProps({
selected: Number, selected: Number,
......
src/main.js
...@@ -37,12 +37,14 @@ import "amfe-flexible/index.min.js"; ...@@ -37,12 +37,14 @@ import "amfe-flexible/index.min.js";
import "../rem.js"; import "../rem.js";
import "./assets/style/common.css" import "./assets/style/common.css"
import schoolYear from './components/schoolYear';
const app = createApp(App); const app = createApp(App);
app.config.globalProperties.$imgUrl = "http://43.143.63.140:8095/"; app.config.globalProperties.$imgUrl = "http://43.143.63.140:8095/";
// process.env.NODE_ENV == "development" // process.env.NODE_ENV == "development"
// ? "//192.168.101.72:8848" // ? "//192.168.101.72:8848"
// : "//43.143.63.140:8095"; // : "//43.143.63.140:8095";
app app
// .use(ElementPlus) // .use(ElementPlus)
// .use(Button) // .use(Button)
...@@ -82,4 +84,4 @@ app ...@@ -82,4 +84,4 @@ app
.use(Calendar) .use(Calendar)
.use(VueHashCalendar) .use(VueHashCalendar)
.use(Uploader).use(DatetimePicker); .use(Uploader).use(DatetimePicker);
app.use(store).use(router).mount("#app"); app.use(store).use(router).component('schoolYear',schoolYear).mount("#app");
src/router/index.js
...@@ -215,6 +215,24 @@ const routes = [ ...@@ -215,6 +215,24 @@ const routes = [
name: "subjectAchievement", name: "subjectAchievement",
component: () => import("../views/parent/studentCourseSelection/subjectAchievement"), component: () => import("../views/parent/studentCourseSelection/subjectAchievement"),
}, },
/* 学校社团 家长端 */
{
path: "/schoolClub",
name:"schoolClub",
component: () => import("../views/parent/schoolClub/index"),
},
/* 学校社团-查看社团详情 家长端 */
{
path: "/schoolClub/clubDetail",
name:"clubDetail",
component: () => import("../views/parent/schoolClub/clueDetail"),
},
/* 学校社团-查看社团详情 家长端 */
{
path: "/schoolClub/clubDetail/clubApply",
name:"clubApply",
component: () => import("../views/parent/schoolClub/clubApply"),
},
/* 学生选课 家长端 成绩查看 */ /* 学生选课 家长端 成绩查看 */
{ {
path: "/totalScoreView", path: "/totalScoreView",
...@@ -613,19 +631,178 @@ const routes = [ ...@@ -613,19 +631,178 @@ const routes = [
{ {
path:"/laboratoryManagement/laboratoryRecord", path:"/laboratoryManagement/laboratoryRecord",
name:'laboratoryRecord', name:'laboratoryRecord',
component: () => import("../views/teacher/laboratoryManagement/laboratoryRecord"), component: () => import("../views/teacher/laboratoryManagement/leader/laboratoryRecord"),
}, },
//领导-实验室完成情况统计 //领导-实验室完成情况统计
{ {
path:"/laboratoryManagement/laboratoryCompleteStatistics", path:"/laboratoryManagement/laboratoryCompleteStatistics",
name: 'laboratoryCompleteStatistics', name: 'laboratoryCompleteStatistics',
component: () => import("../views/teacher/laboratoryManagement/laboratoryCompleteStatistics"), component: () => import("../views/teacher/laboratoryManagement/leader/laboratoryCompleteStatistics"),
}, },
{ {
path:'/laboratoryManagement/laboratoryCompleteStatistics/checkComplete', path:'/laboratoryManagement/laboratoryCompleteStatistics/checkComplete',
name:'checkComplete', name:'checkComplete',
component: () => import("../views/teacher/laboratoryManagement/checkComplete"), component: () => import("../views/teacher/laboratoryManagement/leader/checkComplete"),
} },
// 实验室管理员 - 年级实验预约列表
{
path: '/laboratoryManagement/gradeLaboratory',
name:'gradeLaboratory',
component: () => import("../views/teacher/laboratoryManagement/manager/gradeLaboratory"),
},
// 实验室管理员 - 年级实验预约列表查看
{
path: '/laboratoryManagement/gradeLaboratory/checkGradeComplete',
name:'checkGradeComplete',
component: () => import("../views/teacher/laboratoryManagement/manager/checkGradeComplete"),
},
// 实验室管理员 - 教师实验室预约
{
path: '/laboratoryManagement/teacherLaboratory',
name:'teacherLaboratory',
component: () => import("../views/teacher/laboratoryManagement/manager/teacherLaboratory"),
},
// 实验室管理员 - 教师实验室预约查看/申请审批
{
path: '/laboratoryManagement/teacherLaboratory/teacherLaboratoryApprove',
name:'teacherLaboratoryApprove',
component: () => import("../views/teacher/laboratoryManagement/manager/teacherLaboratoryApprove"),
},
// 实验室管理员 - 个人实验审批
{
path: '/laboratoryManagement/personalLaboratoryApprove',
name:'personalLaboratoryApprove',
component: () => import("../views/teacher/laboratoryManagement/manager/personalLaboratoryApprove"),
},
//级部申请-年级实验室预约
{
path: '/laboratoryManagement/gradeLaboratoryApprove',
name:'gradeLaboratoryApprove',
component: () => import("../views/teacher/laboratoryManagement/levelPart/gradeLaboratoryApprove"),
},
//级部申请-年级实验室预约-新增/查看/修改
{
path: '/laboratoryManagement/gradeLaboratoryApprove/gradeLaboratoryDetail',
name:'gradeLaboratoryDetail',
component: () => import("../views/teacher/laboratoryManagement/levelPart/gradeLaboratoryDetail"),
},
//级部申请-班级完成情况明细
{
path: '/laboratoryManagement/gradeLaboratoryComplete',
name:'gradeLaboratoryComplete',
component: () => import("../views/teacher/laboratoryManagement/levelPart/gradeLaboratoryComplete"),
},
//级部申请-班级完成情况查看
{
path: '/laboratoryManagement/gradeLaboratoryComplete/checkGradeLaboratoryComplete',
name:'checkGradeLaboratoryComplete',
component: () => import("../views/teacher/laboratoryManagement/levelPart/checkGradeLaboratoryComplete"),
},
//级部申请-实验室完成情况明细
{
path: '/laboratoryManagement/laboratoryCompleteDetail',
name:'laboratoryCompleteDetail',
component: () => import("../views/teacher/laboratoryManagement/levelPart/laboratoryCompleteDetail"),
},
//级部申请-查看实验室完成情况
{
path: '/laboratoryManagement/laboratoryCompleteDetail/checkLaboratoryComplete',
name:'checkLaboratoryComplete',
component: () => import("../views/teacher/laboratoryManagement/levelPart/checkLaboratoryComplete"),
},
//教师申请-实验室安排
{
path: '/laboratoryManagement/laboratoryArrangement',
name:'laboratoryArrangement',
component: () => import("../views/teacher/laboratoryManagement/teacher/laboratoryArrangement"),
},
//教师申请-实验室安排查看、申请
{
path: '/laboratoryManagement/laboratoryArrangement/laboratoryArrangementDetail',
name:'laboratoryArrangementDetail',
component: () => import("../views/teacher/laboratoryManagement/teacher/laboratoryArrangementDetail"),
},
//教师申请-实验室申请记录
{
path: '/laboratoryManagement/laboratoryApplicationRecord',
name:'laboratoryApplicationRecord',
component: () => import("../views/teacher/laboratoryManagement/teacher/laboratoryApplicationRecord"),
},
//教师申请-实验室申请记录查看
{
path: '/laboratoryManagement/laboratoryApplicationRecord/checkLaboratoryApplication',
name:'checkLaboratoryApplication',
component: () => import("../views/teacher/laboratoryManagement/teacher/checkLaboratoryApplication"),
},
//教师申请-个人实验申请
{
path: '/laboratoryManagement/PersonalLaboratoryApplication',
name:'PersonalLaboratoryApplication',
component: () => import("../views/teacher/laboratoryManagement/teacher/PersonalLaboratoryApplication"),
},
//教师申请-个人实验申请新增、修改
{
path: '/laboratoryManagement/PersonalLaboratoryApplication/PersonalLaboratoryApplyDetail',
name:'PersonalLaboratoryApplyDetail',
component: () => import("../views/teacher/laboratoryManagement/teacher/PersonalLaboratoryApplyDetail"),
},
/** 实验室管理 laboratoryManagement 管理员权限 教师权限 领导权限 级部权限 **/
/** 安全管理 safetyManagement 教师端 **/
{
path:'/safetyManagement',
name:'safetyManagement',
component: () => import("../views/teacher/safetyManagement/index.vue"),
},
//个人安全管理-车辆出入登记
{
path:'/safetyManagement/carAccessRegistration',
name:'carAccessRegistration',
component: () => import("../views/teacher/safetyManagement/carAccessRegistration"),
},
//个人安全管理-监控录像调阅
{
path:'/safetyManagement/monitoringCall',
name:'monitoringCall',
component: () => import("../views/teacher/safetyManagement/monitoringCall"),
},
//信息中心监控管理-监控调阅内部
{
path:'/safetyManagement/monitoringCallInside',
name:'monitoringCallInside',
component: () => import("../views/teacher/safetyManagement/monitoringCallInside"),
},
//信息中心监控管理-监控调阅外部
{
path:'/safetyManagement/monitoringCallOutside',
name:'monitoringCallOutside',
component: () => import("../views/teacher/safetyManagement/monitoringCallOutside"),
},
//安全管理-车辆登记表
{
path:'/safetyManagement/vehicleRegistration',
name:'vehicleRegistration',
component: () => import("../views/teacher/safetyManagement/vehicleRegistration"),
},
//安全管理-车辆出入登记申请列表
{
path:'/safetyManagement/carAccessRegistrationApply',
name:'carAccessRegistrationApply',
component: () => import("../views/teacher/safetyManagement/carAccessRegistrationApply"),
},
//安全管理-监控调阅内部申请列表
{
path:'/safetyManagement/monitoringCallInsideApply',
name:'monitoringCallInsideApply',
component: () => import("../views/teacher/safetyManagement/monitoringCallInsideApply"),
},
//安全管理-监控调阅外部申请列表
{
path:'/safetyManagement/monitoringCallOutsideApply',
name:'monitoringCallOutsideApply',
component: () => import("../views/teacher/safetyManagement/monitoringCallOutsideApply"),
},
]; ];
......
src/service/laboratoryManagement.js 0 → 100644
/**************实验室管理************/
import axios from "../utils/axios";
/********************** 字典 *******************/
//获取数据字典
export function getDicts(type) {
let url = `/system/dict/data/type/${type}`;
let result = axios.get(url);
return result;
}
/********************** 获取学年学期 *******************/
//获取最新学年学期
export function getNewSchoolYear(){
return axios.get('/wx/level/expriment/getSemester')
};
//获取学年
export function getSchoolYear(data){
return axios.get('/wx/level/expriment/getGrades',{
params:data
})
};
/********************** 领导 *******************/
//领导—实验室完成情况统计
export function getLabCompleteList(data){
return axios.get('/wx/administrators/getexperimentList',{
params:data
})
};
//领导—实验室完成情况统计查看
export function getLabCompleteDetail(data){
return axios.get('/wx/level/expriment/teacherExperimentList',{
params:data
})
};
//领导-教师实验统计
export function getTeacherLabList(data){
return axios.get('/wx/administrators/teachaer/List',{
params:data
})
};
/********************** 实验室管理员 *******************/
//查询实验室列表
export function getLabList(data){
return axios.get('/wx/schoolLab/list')
};
//1.年纪实验室预约
//年级实验室预约分配列表
export function getGradeAllocationList(data){
return axios.get('/wx/administrators/classYear/list',{
params:data
})
};
//年纪实验预约详情
export function getGradePlanDetail(id){
return axios.get(`/wx/administrators/classYear/${id}`)
};
//年级实验室分配
export function gradeLabAllocation(data) {
return axios.put('wx/administrators/classYear/update' ,{
...data
}
);
}
//2.教师实验室预约
//教师预约列表
export function getTeacherOrderList(data){
return axios.get('/wx/administrators/teacher/list',{
params:data
})
};
//教师预约详情
export function getTeacherOrderDetail(id){
return axios.get(`/wx/administrators/teacher/${id}`)
};
//实验室申请详情审批
export function labDetailApprove(data) {
return axios.put('/wx/administrators/teacher/update' ,{
...data
}
);
}
//3.实验计划完成统计
//实验室情况详情
export function getlaboratoryList(data){
return axios.get('/wx/level/expriment/getexperimentList',{
params:data
})
};
//实验室完成情况，班级列表
export function getlaboratoryDetail(data){
return axios.get('/wx/level/expriment/teacherExperimentList',{
params:data
})
};
//4.个人实验审批
//个人实验室申请列表
export function getPersonalApproveList(data){
return axios.get('/wx/administrators/apply/list',{
params:data
})
};
//个人实验室信息详情
export function getPersonalApproveDetail(id){
return axios.get( `/wx/administrators/apply/${id}`)
};
//个人实验室审批
export function personalLabApprove(data) {
return axios.put('/wx/administrators/apply/update' ,{
...data
}
);
}
/********************** 老师申请 *******************/
//1.实验室安排
//1.1 年级预约列表
export function getGradeAppointmentList(data){
return axios.get('/wx/teacher/expriment/classYear/list',{
params:data
})
};
//1.2 老师申请实验室
export function addTeacherLab(data) {
return axios.post('/wx/level/expriment/add' , {
...data
} )
}
//1.2 获取实验计划详细信息
export function getLabPlanDetail(id) {
return axios.get(`/wx/level/expriment/classYear/${id}`);
}
//1.实验室申请记录
//1.1实验室申请记录
export function getLabApplyList(data){
return axios.get('/wx/level/expriment/list',{
params:data
})
};
//1.2实验室申请详情
export function getLabApplyDetail(id) {
return axios.get(`/wx/teacher/expriment/${id}`);
}
//3.个人实验室申请
//3.1 个人实验室申请列表
export function getPersonalLabApplyList(data){
return axios.get('/wx/teacher/expriment/apply/list',{
params:data
})
};
//3.2 个人申请记录详情
export function getPersonalApplyDetail(id) {
return axios.get(`/wx/teacher/expriment/apply/${id}`);
}
//3.3新增个人申请
export function addPersonalApply(data) {
return axios.post('/wx/teacher/expriment/apply/add' , {
...data
} )
}
//3.4 申请上报
export function applyToReport(data) {
return axios.put('/wx/teacher/expriment/apply/report' ,{
...data
}
);
}
//3.4 修改申请
export function editApply(data) {
return axios.put('/wx/teacher/expriment/apply/update' ,{
...data
}
);
}
//3.5 删除个人申请
export function deleteApply(ids){
return axios.delete(`/wx/teacher/expriment/apply/${ids}`)
}
/********************** 级部申请 *******************/
//获取级部id
export function getGradeId(userId){
return axios.get(`/wx/level/expriment/getGrade/${userId}`)
}
//1.实验室完成情况
//实验室情况详情
export function getLabDetail(data) {
return axios.get('/wx/level/expriment/getexperimentList' , {
params:data
} )
}
//实验室完成情况，班级列表
export function getLabListl(data) {
return axios.get('/wx/level/expriment/teacherExperimentList' , {
params:data
} )
}
//2.班级完成情况
//1.班级完成详情
export function getClassCompleteDetail(data) {
return axios.get('/wx/level/expriment/getClassExperimentalDetails' , {
params:data
} )
}
//2.班级完成详情列表
export function getClassCompleteList(data) {
return axios.get('/wx/level/expriment/getClassExperimentList' , {
params:data
} )
}
//3.年级实验室预约
//3.1删除年级实验室预约
export function deleteGradeApply(ids){
return axios.delete(`/wx/level/expriment/${ids}`)
}
//3.2年级预约新增
export function addGradeApply(data) {
return axios.post('/wx/level/expriment/add' , {
...data
} )
}
//3.3 预约列表
export function getGradeApplyList(data) {
return axios.get('/wx/level/expriment/list' , {
params:data
} )
}
//3.4 年级实验计划详情
export function getGradeApplyDetail(ids){
return axios.get(`/wx/level/expriment/${ids}`)
}
//3.5 年级预约修改
export function editGradeApply(data) {
return axios.put('/wx/level/expriment/update' , {
...data
} )
}
//3.6 年级预约详情
export function getApproveDetail(id) {
return axios.get(`/wx/level/expriment/getInfo/${id}` )
}
//3.7 预约实验提交
export function submitLabAppointment(data) {
return axios.put('/wx/level/expriment/report' , {
...data
} )
}
//3.8实验计划下拉列表
export function getexperimentPlanList(data) {
return axios.get('/wx/level/expriment/pxperimentPlanList' , {
params:data
} )
}
src/service/schoolClub.js 0 → 100644
/**
* 学校社团
* */
import axios from "../utils/axios";
//查询社团信息列表
export function getClubInfo() {
return axios.get('/wx/info/getInfo');
}
//根据id获取社团信息详细信息
export function getClubDetail(id) {
return axios.get(`/wx/info/${id}`);
}
//通过当前登录人查询当前社团的报名情况
export function getClubApply(data) {
return axios.get('/wx/info/search',{
params:data
});
}
//新增社团报名或重新报名
export function addClubApply(data) {
return axios.post('/wx/info' , {
...data
} )
}
src/service/studentCourseSelection.js
...@@ -25,7 +25,6 @@ export function getSelectGrade(data) { ...@@ -25,7 +25,6 @@ export function getSelectGrade(data) {
return axios.get('/wx/course/studenttypeview' ,{ return axios.get('/wx/course/studenttypeview' ,{
params:data params:data
} }
); );
} }
......
src/service/utils.js
...@@ -23,7 +23,7 @@ export function getCodeApi() { ...@@ -23,7 +23,7 @@ export function getCodeApi() {
//appId测试：wx765a55464b308d13 appId正式：wx977825b5a132b74d //appId测试：wx765a55464b308d13 appId正式：wx977825b5a132b74d
let url = let url =
"https://open.weixin.qq.com/connect/oauth2/authorize?appid=" + "https://open.weixin.qq.com/connect/oauth2/authorize?appid=" +
"wx765a55464b308d13" + "wx977825b5a132b74d" +
"&redirect_uri=" + "&redirect_uri=" +
urlNow + urlNow +
"&response_type=code&scope=snsapi_base&state=de992d7087bb4ac1bfca11fb7082985d&connect_redirect=1#wechat_redirect"; "&response_type=code&scope=snsapi_base&state=de992d7087bb4ac1bfca11fb7082985d&connect_redirect=1#wechat_redirect";
......
src/utils/scanCode.js
...@@ -9,10 +9,11 @@ import router from "@/router/index.js" ...@@ -9,10 +9,11 @@ import router from "@/router/index.js"
* */ * */
export function scanCodeFun(appId,type){ export function scanCodeFun(appId,type){
console.log('appId',appId) console.log('appId',appId)
let url = location.href.split('#')[0] //获取当前域名 let url = encodeURIComponent(location.href.split('#')[0]) //获取当前域名
// let url = location.origin
console.log('location.href',location.href)
console.log('url',url)
let encode = '' let encode = ''
console.log('location',location)
getWxConfig(url).then(res=>{ getWxConfig(url).then(res=>{
if(res.code == 200){ if(res.code == 200){
const data = res.data const data = res.data
...@@ -30,7 +31,6 @@ export function scanCodeFun(appId,type){ ...@@ -30,7 +31,6 @@ export function scanCodeFun(appId,type){
signature: data.signature, signature: data.signature,
// 必填，需要使用的JS接口列表，所有JS接口列表见附录2 // 必填，需要使用的JS接口列表，所有JS接口列表见附录2
jsApiList: ['scanQRCode'], jsApiList: ['scanQRCode'],
}); });
// setTimeout(()=>{ // setTimeout(()=>{
......
src/views/login/login.vue
...@@ -117,13 +117,13 @@ ...@@ -117,13 +117,13 @@
</van-form> </van-form>
</div> </div>
<!-- </div>--> <!-- </div>-->
<!-- <van-image--> <van-image
<!-- style="background: #e7f4fb; position: absolute; bottom: 0; height: auto"--> style="background: #e7f4fb; position: absolute; bottom: 0; height: auto"
<!-- :src="require('@/assets/login/loginback.png')"--> :src="require('@/assets/login/loginback.png')"
<!-- fit="contain"--> fit="contain"
<!-- width="100%"--> width="100%"
<!-- height="100%"--> height="100%"
<!-- ></van-image>--> ></van-image>
</div> </div>
</template> </template>
...@@ -193,15 +193,17 @@ export default { ...@@ -193,15 +193,17 @@ export default {
const router = useRouter(); const router = useRouter();
const store = useStore(); const store = useStore();
const route = useRoute(); const route = useRoute();
const code = ref('')
let displayStyle = ref('0') let displayStyle = ref('0')
onMounted( () => { onMounted( () => {
console.log('route',route.query.isLogout)
console.log('displayStyle',displayStyle.value) console.log('displayStyle',displayStyle.value)
getToken() getToken()
if (process.env.NODE_ENV != "development") { if (process.env.NODE_ENV != "development") {
//获取openId //获取openId
let code = getUrlKey("code"); code.value = getUrlKey("code");
console.log('code',code) console.log('code',code)
if (isEmpty(code)) getCodeApi() ; if (isEmpty(code.value)) getCodeApi() ;
else checkOpenIdOrWxCookie(); else checkOpenIdOrWxCookie();
} }
}); });
......
src/views/parent/schoolClub/clubApply.vue 0 → 100644
<template>
<van-nav-bar title="社团报名" left-text="返回" left-arrow @click-left="goback"></van-nav-bar>
<van-form style="margin-top: 20px;" @submit="onSubmit">
<van-cell-group inset>
<van-field
readonly
v-model="grade"
name="grade"
label="级部"
/>
<van-field
readonly
v-model="classes"
name="classes"
label="班级"
/>
<van-field
readonly
v-model="name"
name="name"
label="姓名"
/>
<van-field
readonly
v-model="sex"
name="sex"
label="性别"
/>
<van-field
:readonly="status == '1' || status == '2' ? true:false"
v-model="hobby"
name="hobby"
label="兴趣爱好"
rows="4"
autosize
type="textarea"
/>
<van-field
:readonly="status == '1' || status == '2' ? true:false"
v-model="reason"
name="reason"
label="申请理由"
rows="4"
autosize
type="textarea"
/>
</van-cell-group>
<div style="margin: 16px;">
<van-button v-if="status == '1'" round block type="primary">
已报名等待审核
</van-button>
<van-button v-else-if="status == '2'" round block type="primary">
已同意
</van-button>
<div v-else-if="status == '3'" style="text-align: center">
<van-button type="warning" style="margin-right: 10px;border-radius: 5px;width: 90px;height: 40px">
不同意
</van-button>
<van-button type="success" style="border-radius: 5px;width: 90px;height: 40px" native-type="submit">
重新报名
</van-button>
</div>
<van-button v-else round block type="primary" native-type="submit">
报名
</van-button>
</div>
</van-form>
</template>
<script setup>
import {getClubApply, addClubApply} from '@/service/schoolClub'
import router from "../../../router";
import {onMounted, ref} from "vue";
import {useStore} from "vuex";
import {useRoute} from "vue-router";
const grade = ref('');
const classes = ref('');
const name = ref('');
const sex = ref('');
const hobby = ref('');
const reason = ref('');
const status = ref('');
const store = useStore();
const route = useRoute();
onMounted(async ()=>{
const params = {
cid:route.query.id
}
let result = await getClubApply(params)
if(result.code == 200){
grade.value = result.data.grade
classes.value = result.data.classes
name.value = result.data.name
sex.value = result.data.sex
hobby.value = result.data.hobby
reason.value = result.data.reason
reason.value = result.data.reason
status.value = result.data.status
}
console.log('result',result)
})
const goback = () => {
router.back()
}
const onSubmit = (values) => {
console.log('submit', values);
values.cid = route.query.id;
values.orgName = route.query.name
values.userId = store.state.userInfo.userId
console.log('values',values)
};
</script>
<style scoped>
</style>
src/views/parent/schoolClub/clueDetail.vue 0 → 100644
<template>
<van-nav-bar title="社团风采" left-text="返回" left-arrow @click-left="goback"></van-nav-bar>
<div style="margin: 10px 20px">
<div class="clubApply">
<div style="display: flex;justify-content: right;margin-bottom: 10px">
<van-button size="small" type="primary" @click="toClubApply">社团报名</van-button>
</div>
<div class="swiper">
<van-swipe class="my-swipe" :autoplay="3000" indicator-color="white" >
<van-swipe-item v-for="(item,index) in 6" :key="index">{{ index }}</van-swipe-item>
<!-- <van-swipe-item v-for="(item,index) in content" :key="index">{{ index }}</van-swipe-item>-->
</van-swipe>
</div>
<div class="clubContent">
<div>
<p class="title">社团宗旨</p>
<p class="content">{{aim}}</p>
</div>
<div>
<p class="title">社团简介</p>
<p class="content">{{ intro }}</p>
</div>
</div>
</div>
</div>
</template>
<script setup>
import {getClubDetail} from '@/service/schoolClub'
import {onMounted, ref} from "vue";
import {useStore} from "vuex";
import {useRouter,useRoute} from "vue-router";
const router = useRouter()
const route = useRoute()
const content = ref()
const aim = ref('')
const intro = ref('')
onMounted( async () => {
let result = await getClubDetail(route.query.id)
console.log('result',result)
if(result.code == 200){
aim.value = result.data.aim
intro.value = result.data.intro
content.value = result.data.imgs
}
})
//社团报名按钮
const toClubApply = () => {
router.push({
path: "/schoolClub/clubDetail/clubApply",
query:{
id:route.query.id,
name:route.query.name
}
})
};
const goback = () => {
router.back()
}
</script>
<style scoped>
.clubApply {
/*float: right;*/
}
.my-swipe .van-swipe-item {
color: #fff;
font-size: 20px;
line-height: 150px;
text-align: center;
background-color: #39a9ed;
}
.title{
font-size: 14px;
}
.content{
font-size: 12px;
}
</style>
src/views/parent/schoolClub/index.vue 0 → 100644
<template>
<van-nav-bar title="社团基础信息查看" left-text="返回" left-arrow @click-left="goback"></van-nav-bar>
<van-pull-refresh v-model="refreshing" @refresh="onRefresh">
<van-list
v-model:loading="loading"
:finished="finished"
finished-text="没有更多了"
@load="onLoad"
>
<div class="clubWrap">
<div class="clubItem" v-for="item in list" :key="item.id">
<div style="position: relative" @click="toDetail(item.id,item.name)">
<div class="image">
<van-image
fit="contain"
radius="10"
:src='item.src'
/>
</div>
<div class="clubName">{{ item.name }}</div>
<div v-if="item.isattend == '1'" class="join">已参加</div>
<div v-if="item.isattend == '2'" class="unJoin">未参加</div>
</div>
</div>
</div>
</van-list>
</van-pull-refresh>
</template>
<script setup>
import {getClubInfo} from '@/service/schoolClub'
import {onMounted, ref} from "vue";
import {useRouter} from "vue-router";
import {Toast} from "vant";
const router = useRouter()
const list = ref([]);
const loading = ref(false);
const finished = ref(false);
const refreshing = ref(false);
const src = ref()
const imgArr = ref([])
onMounted(async () => {
})
const onLoad = async () => {
if (refreshing.value) {
list.value = [];
pageNum.value = 0;
refreshing.value = false;
}
let result = await getClubInfo()
console.log('result', result)
if (result.code == 200) {
loading.value = false;
list.value = result.data
imgArr.value = result.data.map(item => item.imgs)
// src.value = imgArr.value.map(item => )
finished.value = true
}else {
Toast("获取信息失败!");
finished.value = true;
loading.value = false;
return;
}
};
const onRefresh = () => {
// 清空列表数据
finished.value = false;
// 重新加载数据
// 将 loading 设置为 true，表示处于加载状态
loading.value = true;
onLoad();
};
//点击查看详情
const toDetail = (id,name) => {
router.push({
path: '/schoolClub/clubDetail',
query:{
id:id,
name:name
}
})
}
const goback = () => {
router.back()
}
</script>
<style scoped>
.clubWrap {
margin: 20px 0px 20px 20px;
display: flex;
box-sizing: border-box;
flex-wrap: wrap;
/*position: relative;*/
}
.clubItem {
width: 50%;
margin-bottom: 20px;
}
.image {
margin-right: 20px;
border-radius: 10px;
border: 1px solid silver;
}
.van-image {
border-radius: 10px;
}
.clubName {
margin-right: 20px;
text-align: center;
font-size: 16px;
margin-top: 10px;
}
.join, .unJoin {
font-size: 12px;
position: absolute;
top: 0;
right: 21px;
color: #FFFFFF;
width: 50px;
height: 20px;
line-height: 20px;
text-align: center;
border-radius: 6px;
}
.join {
background: #e5c35d;
}
.unJoin {
background: #00c15d;
}
</style>
src/views/public/questionnaire/questionnairelist.vue
...@@ -165,6 +165,8 @@ const deleteteatcherll = async (item) => { ...@@ -165,6 +165,8 @@ const deleteteatcherll = async (item) => {
if (result.code == 200) { if (result.code == 200) {
Toast("删除成功"); Toast("删除成功");
onRefresh(); onRefresh();
}else{
Toast("删除失败!");
} }
}; };
const poststdleave = async (item) => { const poststdleave = async (item) => {
...@@ -175,6 +177,8 @@ const poststdleave = async (item) => { ...@@ -175,6 +177,8 @@ const poststdleave = async (item) => {
if (result.code == 200) { if (result.code == 200) {
Toast("提交成功"); Toast("提交成功");
onRefresh(); onRefresh();
}else{
Toast("提交失败!");
} }
}; };
const option1 = [ const option1 = [
......
src/views/tabbar/PersonInfo.vue
...@@ -451,10 +451,13 @@ export default { ...@@ -451,10 +451,13 @@ export default {
//删除所有 //删除所有
//localStorage.clear(); //localStorage.clear();
Toast.success("退出成功"); Toast.success("退出成功");
router.push({ //测试服务器
path: "/login", console.log('window',window)
query: {}, window.location.href = window.location.href.split('?')[0]
}); // router.push({
// path: "/login",
// query: {},
// });
}) })
.catch(() => {}); .catch(() => {});
}; };
......
src/views/tabbar/TeacherInfo.vue
...@@ -319,11 +319,9 @@ export default { ...@@ -319,11 +319,9 @@ export default {
//localStorage.clear(); //localStorage.clear();
Toast.success("退出成功"); Toast.success("退出成功");
console.log('openId',store) console.log('openId',store)
// window.open('http://www.dyzmxx.com/zhxygzh')
//测试服务器 //测试服务器
console.log('window',window) console.log('window',window)
window.location.href = window.location.origin window.location.href = window.location.href.split('?')[0]
// router.replace({ // router.replace({
// path: "/login", // path: "/login",
// query: { // query: {
......
src/views/tabbar/main/index.vue
...@@ -191,6 +191,13 @@ ...@@ -191,6 +191,13 @@
/> />
<span class="item_text">学生选课</span> <span class="item_text">学生选课</span>
</van-grid-item> </van-grid-item>
<van-grid-item icon="photo-o" text="学校社团" url=" #/schoolClub">
<van-image
style="width: 48px"
:src="require('@/assets/index/rkls.png')"
/>
<span class="item_text">学校社团</span>
</van-grid-item>
<!-- <van-grid-item icon="photo-o" text="请假" url=" #/studentLeavetask"> <!-- <van-grid-item icon="photo-o" text="请假" url=" #/studentLeavetask">
<van-image <van-image
style="width: 48px" style="width: 48px"
...@@ -426,6 +433,13 @@ ...@@ -426,6 +433,13 @@
</van-grid-item> </van-grid-item>
<!--2023-08-24 新增实验室管理模块--> <!--2023-08-24 新增实验室管理模块-->
<!--2023-09-11 新增安全管理模块-->
<van-grid-item icon="photo-o" text="安全管理" url="#/safetyManagement">
<van-image style="width: 48px" :src="require('@/assets/index/dcwj.png')"/>
<span class="item_text">安全管理</span>
</van-grid-item>
<!--2023-09-11 新增安全管理模块-->
<!-- <van-grid-item icon="photo-o" text="我的领用" url=" #/myUse"> <!-- <van-grid-item icon="photo-o" text="我的领用" url=" #/myUse">
<van-image <van-image
style="width: 24px" style="width: 24px"
...@@ -520,6 +534,8 @@ import { storetyprelationshiptyp } from "@/service/dir"; ...@@ -520,6 +534,8 @@ import { storetyprelationshiptyp } from "@/service/dir";
import { import {
getStudentInfo,//学生选课信息查询 getStudentInfo,//学生选课信息查询
} from "@/service/studentCourseSelection"; } from "@/service/studentCourseSelection";
import {getGradeId} from '@/service/laboratoryManagement'
export default { export default {
name: "Home", name: "Home",
...@@ -643,6 +659,7 @@ export default { ...@@ -643,6 +659,7 @@ export default {
console.log('info',result) console.log('info',result)
if (result.code === 200) { if (result.code === 200) {
let userInfo = result.userInfo; let userInfo = result.userInfo;
if (userInfo.type == 1) { if (userInfo.type == 1) {
parentShow.value = true; parentShow.value = true;
} else { } else {
...@@ -659,7 +676,12 @@ export default { ...@@ -659,7 +676,12 @@ export default {
store.commit("editTeacherId", userInfo.teacherId); store.commit("editTeacherId", userInfo.teacherId);
store.commit("editTeacherName", userInfo.teacherName); store.commit("editTeacherName", userInfo.teacherName);
store.commit("edituserInfo", userInfo); store.commit("edituserInfo", userInfo);
console.log('userInfo',userInfo) console.log('userInfo666',userInfo)
let gradeId = await getGradeId(userInfo.userId)
console.log('gradeId',gradeId)
if(gradeId.code == 200){
store.commit("editGradeId", gradeId.data);
}
onInitData(); onInitData();
} }
}; };
......
src/views/teacher/laboratoryManagement/index.vue
<template> <template>
<van-nav-bar title="实验室管理" left-text="返回" left-arrow @click-left="goback" ></van-nav-bar> <van-nav-bar title="实验室管理" left-text="返回" left-arrow @click-left="goback" ></van-nav-bar>
<!--领导 --> <!--领导 -->
<div class="recordBlock" @click="toPage(1)"> <!-- <div v-if="leaderRole == true">-->
<van-image class="leftImg" :src="require('../../../assets/icon/record.png')"/> <div class="recordBlock" @click="toPage(1)">
<div>实验室记录</div> <van-image class="leftImg" :src="require('../../../assets/icon/record.png')"/>
</div> <div>教师实验室统计</div>
<div class="statisticsBlock" @click="toPage(2)"> </div>
<van-image class="leftImg" :src="require('../../../assets/icon/statistics.png')"/> <div class="statisticsBlock" @click="toPage(2)">
<div>实验室完成情况统计</div> <van-image class="leftImg" :src="require('../../../assets/icon/statistics.png')"/>
</div> <div>实验室完成情况统计</div>
</div>
<!-- </div>-->
<!--实验室管理员 --> <!--实验室管理员 -->
<div class="orderBlock" @click="toPage(3)"> <!-- <div v-if="managerRole == true">-->
<van-image class="leftImg" :src="require('../../../assets/icon/order.png')"/> <div class="orderBlock" @click="toPage(3)">
<div>年级实验室预约</div> <van-image class="leftImg" :src="require('../../../assets/icon/order.png')"/>
</div> <div>年级实验预约</div>
<div class="techerOrderBlock" @click="toPage(4)"> </div>
<van-image class="leftImg" :src="require('../../../assets/icon/teacherOrder.png')"/> <div class="techerOrderBlock" @click="toPage(4)">
<div>教师实验室预约</div> <van-image class="leftImg" :src="require('../../../assets/icon/teacherOrder.png')"/>
</div> <div>教师实验室预约</div>
<div class="planBlock" @click="toPage(5)"> </div>
<van-image class="leftImg" :src="require('../../../assets/icon/plan.png')"/> <div class="planBlock" @click="toPage(5)">
<div>实验室计划完成统计</div> <van-image class="leftImg" :src="require('../../../assets/icon/plan.png')"/>
</div> <div>实验计划完成统计</div>
<div class="personalBlock" @click="toPage(6)"> </div>
<van-image class="leftImg" :src="require('../../../assets/icon/personal.png')"/> <div class="personalBlock" @click="toPage(6)">
<div>个人实验审批</div> <van-image class="leftImg" :src="require('../../../assets/icon/personal.png')"/>
</div> <div>个人实验审批</div>
<div class="competitionBlock" @click="toPage(7)"> </div>
<van-image class="leftImg" :src="require('../../../assets/icon/competition.png')"/> <!-- </div>-->
<div>实验室竞赛</div>
</div> <!-- <div class="competitionBlock" @click="toPage(7)">-->
<!-- <van-image class="leftImg" :src="require('../../../assets/icon/competition.png')"/>-->
<!-- <div>实验室竞赛</div>-->
<!-- </div>-->
<!--级部申请--> <!--级部申请-->
<div class="levelOrderBlock" @click="toPage(8)"> <!-- <div v-if="levelPartRole == true">-->
<van-image class="leftImg" :src="require('../../../assets/icon/level.png')"/> <div class="levelOrderBlock" @click="toPage(8)">
<div>年级实验室预约</div> <van-image class="leftImg" :src="require('../../../assets/icon/level.png')"/>
</div> <div>年级实验室预约</div>
<div class="classFinishBlock" @click="toPage(9)"> </div>
<van-image class="leftImg" :src="require('../../../assets/icon/classFinish.png')"/> <div class="classFinishBlock" @click="toPage(9)">
<div>班级完成情况明细</div> <van-image class="leftImg" :src="require('../../../assets/icon/classFinish.png')"/>
</div> <div>班级完成情况明细</div>
<div class="levelFinishBlock" @click="toPage(10)"> </div>
<van-image class="leftImg" :src="require('../../../assets/icon/levelFinish.png')"/> <div class="levelFinishBlock" @click="toPage(10)">
<div>实验室完成情况统计</div> <van-image class="leftImg" :src="require('../../../assets/icon/levelFinish.png')"/>
</div> <div>实验室完成情况明细</div>
</div>
<!-- </div>-->
<!--教师申请--> <!--教师申请-->
<div class="laboratoryBlock" @click="toPage(11)"> <!-- <div v-if="teacherRole == true">-->
<van-image class="leftImg" :src="require('../../../assets/icon/laboratoryArrangement.png')"/> <div class="laboratoryBlock" @click="toPage(11)">
<div>实验室安排</div> <van-image class="leftImg" :src="require('../../../assets/icon/laboratoryArrangement.png')"/>
</div> <div>实验室安排</div>
<div class="laboratoryRecordBlock" @click="toPage(12)"> </div>
<van-image class="leftImg" :src="require('../../../assets/icon/laboratoryRecord.png')"/> <div class="laboratoryRecordBlock" @click="toPage(12)">
<div>实验室申请记录</div> <van-image class="leftImg" :src="require('../../../assets/icon/laboratoryRecord.png')"/>
</div> <div>实验室申请记录</div>
<div class="personalApplicationBlock" @click="toPage(13)"> </div>
<van-image class="leftImg" :src="require('../../../assets/icon/personalApplication.png')"/> <div class="personalApplicationBlock" @click="toPage(13)">
<div>个人实验室申请</div> <van-image class="leftImg" :src="require('../../../assets/icon/personalApplication.png')"/>
</div> <div>个人实验室申请</div>
</div>
<!-- </div>-->
</template> </template>
<script setup> <script setup>
...@@ -76,25 +87,120 @@ const managerRole = ref() ...@@ -76,25 +87,120 @@ const managerRole = ref()
const levelPartRole = ref() const levelPartRole = ref()
//教师 //教师
const teacherRole = ref() const teacherRole = ref()
//查找角色 onMounted(()=>{
//查找角色
//领导-校领导
// rolesArr.find(item => { // rolesArr.find(item => {
// if(item == ''){ // if(item == 'schoolLeader'){
// return leaderRole.value = true // return leaderRole.value = true
// }else{ // }else{
// leaderRole.value = false // leaderRole.value = false
// } // }
// }) // })
// 级部-级部主任
// rolesArr.find(item => {
// if(item == 'gradeLeader'){
// return levelPartRole.value = true
// }else{
// levelPartRole.value = false
// }
// })
//实验室管理员
// rolesArr.find(item => {
// if(item == 'phy_lab_admin' || item == 'che_lab_admin' || item == 'bio_lab_admin'){
// return managerRole.value = true
// }else{
// managerRole.value = false
// }
// })
//教师
// rolesArr.find(item => {
// if(item == 'teacher'){
// return teacherRole.value = true
// }else{
// teacherRole.value = false
// }
// })
})
const toPage = (type) => { const toPage = (type) => {
if(type == 1){ if(type == 1){
//领导-实验室记录 //领导-教师实验统计
router.push({ router.push({
path:"/laboratoryManagement/laboratoryRecord" path:"/laboratoryManagement/laboratoryRecord"
}) })
} }
if(type == 2){ if(type == 2){
//领导-实验室记录 //领导-实验室完成情况统计
router.push({
path:"/laboratoryManagement/laboratoryCompleteStatistics",
query:{
type:2
}
})
}
if(type == 3){
//实验室管理员-年级实验预约列表
router.push({
path:"/laboratoryManagement/gradeLaboratory"
})
}
if(type == 4){
//实验室管理员-教师实验室预约
router.push({
path:"/laboratoryManagement/teacherLaboratory"
})
}
if(type == 5){
//实验室管理员-实验计划完成统计
router.push({
path: '/laboratoryManagement/laboratoryCompleteStatistics',
query:{
type:5
}
})
}
if(type == 6){
//实验室管理员-个人实验审批
router.push({
path: '/laboratoryManagement/personalLaboratoryApprove',
})
}
if(type == 8){
//级部申请-年级实验室预约
router.push({
path: '/laboratoryManagement/gradeLaboratoryApprove',
})
}
if(type == 9){
//级部申请-班级完成情况明细
router.push({
path: '/laboratoryManagement/gradeLaboratoryComplete',
})
}
if(type == 10){
//级部申请-实验室完成情况明细
router.push({
path: '/laboratoryManagement/laboratoryCompleteDetail',
})
}
if(type == 11){
//教师申请-实验室安排
router.push({
path: '/laboratoryManagement/laboratoryArrangement',
})
}
if(type == 12){
//教师申请-实验室申请记录
router.push({
path: '/laboratoryManagement/laboratoryApplicationRecord',
})
}
if(type == 13){
//教师申请-个人实验申请
router.push({ router.push({
path:"/laboratoryManagement/laboratoryCompleteStatistics" path: '/laboratoryManagement/PersonalLaboratoryApplication',
}) })
} }
} }
......
src/views/teacher/laboratoryManagement/leader/checkComplete.vue 0 → 100644
<!--领导 查看班级完成情况-->
<template>
<van-nav-bar title="查看班级完成情况" left-text="返回" left-arrow @click-left="goback"></van-nav-bar>
<div>
<form action="/">
<van-search
v-model="searchValue"
show-action
placeholder="搜索班级、实验时间段、已上报、未上报等"
@search="onSearch"
@cancel="onCancel"
/>
</form>
<van-pull-refresh v-model="refreshing" @refresh="onRefresh">
<div style="text-align: center">
<van-image v-if="route.query.sub == '1'" style="height: 20px;width: 20px;vertical-align: middle" :src="require('../../../../assets/icon/physics.png')"></van-image>
<van-image v-if="route.query.sub == '3'" style="height: 20px;width: 20px;vertical-align: middle" :src="require('../../../../assets/icon/biology.png')"></van-image>
<van-image v-if="route.query.sub == '2'" style="height: 20px;width: 20px;vertical-align: middle" :src="require('../../../../assets/icon/chemistry.png')"></van-image>
<span style="font-size: 16px;font-weight: bold;padding-left: 5px">{{route.query.sub == '1' ? '物理' : route.query.sub == '2' ? '化学' : '生物'}}研究</span>
</div>
<van-list
v-model:loading="loading"
:finished="finished"
finished-text="没有更多了"
@load="onLoad"
>
<div v-for="(item,index) in list" :key="index">
<div class="card">
<div class="leftContent">
<div style="margin: 10px 0;">
<span>班级：</span>
<span>{{ item.className }}</span>
</div>
<div style="margin-bottom: 10px">
<span>节次：</span>
<span>{{ item.section }}</span>
</div>
</div>
<div class="middleContent">
<div style="margin: 10px 0;">
<span>实验分类：</span>
<span>{{ item.experimentClassify == '1' ? '分组实验' : item.experimentClassify == '2' ? '演示实验' : '探究实验' }}</span>
</div>
<div style="margin-bottom: 10px">
<span>实验时间：</span>
<span>{{ item.experimentTime }}</span>
</div>
</div>
<div v-if="item.state == '1'" class="rightContent complete">
<div>已完成</div>
</div>
<div v-if="item.state == '0'" class="rightContent unfinished">
<div>未完成</div>
</div>
</div>
</div>
</van-list>
</van-pull-refresh>
</div>
</template>
<script setup>
import {getLabCompleteDetail,getlaboratoryDetail} from '@/service/laboratoryManagement'
import {reactive, onMounted, toRefs, ref} from "vue";
import {useStore} from "vuex";
import {useRouter, useRoute} from "vue-router";
import {formatDate} from "@/utils/time";
import {Toast} from "vant";
const store = useStore()
const router = useRouter()
const route = useRoute()
const type = route.query.type
//列表数据
const list = ref([]);
//loading 和 finished 两个变量控制加载状态
//当组件滚动到底部时，会触发 load 事件并将 loading 设置成 true。
//此时可以发起异步操作并更新数据，数据更新完毕后，将 loading 设置成 false 即可。
// 若数据已全部加载完毕，则直接将 finished 设置成 true 即可。
const loading = ref(false);
const finished = ref(false);
const refreshing = ref(false);
const searchValue = ref('');
console.log('item',route.query)
//列表加载事件
const onLoad = async () => {
if (refreshing.value) {
list.value = [];
refreshing.value = false;
}
if (type == 2) {
console.log(type)
//领导-实验室完成情况统计
const params = {
schoolYear:route.query.schoolYear,
semester:route.query.semester,
grade:route.query.grade,
experimentName:route.query.experimentName,
id:route.query.id,
labClassYearId:route.query.labClassYearId,
querText:searchValue.value
}
let leaderResult = await getLabCompleteDetail(params)
console.log('leaderResult',leaderResult)
if(leaderResult.code == 200){
loading.value = false;
list.value = leaderResult.data
finished.value = true
}else{
Toast("获取信息失败!");
finished.value = true;
loading.value = false;
return;
}
}
if (type == 5) {
console.log(type)
//实验室管理员-实验计划完成统计
const params = {
schoolYear:route.query.schoolYear,
semester:route.query.semester,
grade:route.query.grade,
experimentName:route.query.experimentName,
id:route.query.id,
labClassYearId:route.query.labClassYearId,
querText:searchValue.value
}
let leaderResult = await getlaboratoryDetail(params)
console.log('leaderResult',leaderResult)
if(leaderResult.code == 200){
loading.value = false;
list.value = leaderResult.data
finished.value = true
}else{
Toast("获取信息失败!");
finished.value = true;
loading.value = false;
return;
}
}
//接口
// let result = await getBorrowList(id,equipmentName.value)
// console.log('result',result)
// if(result.code == 200){
// loading.value = false;
// list.value = result.data
// finished.value = true
// }else{
// Toast("获取信息失败!");
// finished.value = true;
// loading.value = false;
// return;
// }
}
//下拉刷新
const onRefresh = () => {
//// 清空列表数据
finished.value = false;
// 重新加载数据
// 将 loading 设置为 true，表示处于加载状态
loading.value = true;
onLoad()
};
//搜索
const onSearch = (val) => {
};
//取消
const onCancel = () => {
onLoad()
};
//返回上一页
const goback = () => {
router.back();
}
</script>
<style scoped>
.card {
background: #FFFFFF;
margin: 10px;
display: flex;
justify-content: space-around;
height: 80px;
align-items: center;
border-radius: 20px;
}
.leftContent {
display: flex;
flex-direction: column;
font-size: 14px;
}
.middleContent {
display: flex;
flex-direction: column;
font-size: 14px;
}
.rightContent {
font-size: 14px;
writing-mode: vertical-rl;
color: #FFFFFF;
border-radius: 5px;
height: 60px;
text-align: center;
width: 20px;
}
.complete {
background: rgb(155, 194, 155);
}
.unfinished {
background: rgb(106, 149, 236);
}
</style>
src/views/teacher/laboratoryManagement/leader/laboratoryCompleteStatistics.vue 0 → 100644
<!--领导-实验室完成情况统计-->
<!--实验室管理员-实验计划完成统计-->
<template>
<van-nav-bar :title="title" left-text="返回" left-arrow @click-left="goback" ></van-nav-bar>
<div>
<!-- 搜索框 -->
<form action="/">
<van-search
v-model="applyName"
show-action
placeholder="搜索级部、实验名称等"
@search="onSearch"
@cancel="onCancel"
/>
</form>
<!--学年/学期 -->
<schoolYear @select="handleSelect"></schoolYear>
<van-pull-refresh v-model="refreshing" @refresh="onRefresh">
<van-list
v-model:loading="loading"
:finished="finished"
finished-text="没有更多了"
@load="onLoad"
>
<div v-for="(item,index) in list" :key="index">
<div class="card" @click="toCheckComplete(item)">
<div class="topContent">
<div class="topLeft">
<van-image v-if="item.sub == '1'" style="height: 20px;width: 20px;vertical-align: middle" :src="require('../../../../assets/icon/physics.png')"></van-image>
<van-image v-if="item.sub == '3'" style="height: 20px;width: 20px;vertical-align: middle" :src="require('../../../../assets/icon/biology.png')"></van-image>
<van-image v-if="item.sub == '2'" style="height: 20px;width: 20px;vertical-align: middle" :src="require('../../../../assets/icon/chemistry.png')"></van-image>
<span style="font-size: 16px;font-weight: bold;padding-left: 5px">{{item.sub == '1' ? '物理' : item.sub == '2' ? '化学' : '生物'}}研究</span>
</div>
<div class="topRight">
<div style="font-size: 14px;color: #FFFFFF">{{ item.schoolYear }}{{item.semester == '1' ? '上学期':'下学期'}}</div>
</div>
</div>
<div class="bottomContent">
<div class="experimentType">
<div>级部</div>
<div style="color:#4ea0fc;">{{ item.grade }}</div>
</div>
<div class="experimentType">
<div>总班级数</div>
<div style="color:#4ea0fc;">{{ item.count }}个</div>
</div>
<div class="experimentType">
<div>已完成班级数</div>
<div style="color:#4ea0fc;">{{ item.complete }}个</div>
</div>
<div class="experimentType">
<div>未完成班级数</div>
<div style="color:#4ea0fc;">{{item.incomplete}}个</div>
</div>
</div>
</div>
</div>
</van-list>
</van-pull-refresh>
</div>
</template>
<script setup>
import {getLabCompleteList, getlaboratoryList} from '@/service/laboratoryManagement'
import { reactive, onMounted, toRefs, ref } from "vue";
import { useStore } from "vuex";
import { useRouter, useRoute } from "vue-router";
import { formatDate } from "@/utils/time";
import {Toast} from "vant";
const store = useStore()
const router = useRouter()
const route = useRoute()
const title = ref('')
const type = route.query.type
const semester = ref('');
const year = ref('');
const applyName = ref('');
//选中学年的参数
const handleSelect = (value) => {
console.log('handleSelect', value)
year.value = value[0];
semester.value = value[1];
onLoad()
}
//列表数据
const list = ref();
//loading 和 finished 两个变量控制加载状态
//当组件滚动到底部时，会触发 load 事件并将 loading 设置成 true。
//此时可以发起异步操作并更新数据，数据更新完毕后，将 loading 设置成 false 即可。
// 若数据已全部加载完毕，则直接将 finished 设置成 true 即可。
const loading = ref(false);
const finished = ref(false);
const refreshing = ref(false);
onMounted(()=>{
})
//列表加载事件
const onLoad = async () => {
if (refreshing.value) {
list.value = [];
refreshing.value = false;
}
if(type == 2){
console.log(type)
//领导-实验室完成情况统计
title.value = '实验室完成情况'
if(semester.value == '上学期' ||semester.value == '1'){
semester.value = '1'
}else{
semester.value = '2'
}
const params = {
schoolYear: year.value,
semester: semester.value,
querText: applyName.value,
}
console.log('params',params)
let result = await getLabCompleteList(params)
console.log('result', result)
if(result.code == 200){
loading.value = false;
list.value = result.data
finished.value = true
}else {
Toast("获取信息失败!");
finished.value = true;
loading.value = false;
return;
}
}
if(type == 5){
console.log(type)
//实验室管理员-实验计划完成统计
title.value = '实验计划完成统计'
if(semester.value == '上学期' ||semester.value == '1'){
semester.value = '1'
}else{
semester.value = '2'
}
const params = {
schoolYear: year.value,
semester: semester.value,
querText: applyName.value
}
console.log('params',params)
let result = await getlaboratoryList(params)
console.log('result', result)
if(result.code == 200){
loading.value = false;
list.value = result.data
finished.value = true
}else {
Toast("获取信息失败!");
finished.value = true;
loading.value = false;
return;
}
}
}
//点击事件
const toCheckComplete = (item) => {
console.log('111',item)
router.push({
path:'/laboratoryManagement/laboratoryCompleteStatistics/checkComplete',
query:{
schoolYear:item.schoolYear,
semester:item.semester,
grade:item.grade,
experimentName:item.experimentName,
id:item.id,
sub:item.sub,
type:type,
labClassYearId:item.labClassYearId
}
})
}
//下拉刷新
const onRefresh = () => {
//// 清空列表数据
finished.value = false;
// 重新加载数据
// 将 loading 设置为 true，表示处于加载状态
loading.value = true;
onLoad()
};
//搜索
const onSearch = (val) => {
onLoad()
};
//取消
const onCancel = () => {
onLoad()
};
//返回上一页
const goback = () => {
router.back();
}
</script>
<style scoped>
.card{
background: #FFFFFF;
margin: 10px;
border-radius: 20px;
}
.topContent{
display: flex;
flex-direction: row;
justify-content: space-between;
padding-top: 15px;
padding-bottom: 10px;
border-bottom:1px solid #aebdc5 ;
margin-left: 10px;
margin-right: 10px;
}
.topLeft{
display: flex;
align-items: center;
justify-content: center;
}
.topRight{
margin-top: -5px;
text-align: center;
width: 85px;
height: 22px;
line-height: 22px;
border-radius: 10px;
background: #4ea0fc;
}
.bottomContent{
margin-top: 10px;
padding-bottom: 10px;
display: flex;
flex-direction: row;
justify-content: space-around;
}
.experimentType{
justify-content: center;
align-items: center;
font-size: 14px;
display: flex;
flex-direction: column;
}
</style>
src/views/teacher/laboratoryManagement/laboratoryRecord.vue → src/views/teacher/laboratoryManagement/leader/laboratoryRecord.vue
<!--领导--> <!--领导-->
<template> <template>
<van-nav-bar title="实验室记录" left-text="返回" left-arrow @click-left="goback" ></van-nav-bar> <van-nav-bar title="教师实验统计" left-text="返回" left-arrow @click-left="goback"></van-nav-bar>
<div> <div>
<!-- 搜索框 -->
<form action="/">
<van-search
v-model="applyName"
show-action
placeholder="搜索姓名"
@search="onSearch"
@cancel="onCancel"
/>
</form>
<!--学年/学期 -->
<schoolYear @select="handleSelect"></schoolYear>
<van-pull-refresh v-model="refreshing" @refresh="onRefresh"> <van-pull-refresh v-model="refreshing" @refresh="onRefresh">
<form action="/">
<van-search
v-model="searchValue"
show-action
placeholder="请输入搜索关键词"
@search="onSearch"
@cancel="onCancel"
/>
</form>
<van-list <van-list
v-model:loading="loading" v-model:loading="loading"
:finished="finished" :finished="finished"
...@@ -22,8 +25,8 @@ ...@@ -22,8 +25,8 @@
<div class="card"> <div class="card">
<div class="topContent"> <div class="topContent">
<div class="topLeft"> <div class="topLeft">
<van-image :src="require('../../../assets/icon/laboratory.png')"></van-image> <van-image :src="require('../../../../assets/icon/laboratory.png')"></van-image>
<span style="font-size: 16px;font-weight: bold;padding-left: 5px">张三</span> <span style="font-size: 16px;font-weight: bold;padding-left: 5px">{{ item.applyName }}</span>
</div> </div>
<div class="topRight"> <div class="topRight">
<div style="font-size: 14px;color: #FFFFFF">2022</div> <div style="font-size: 14px;color: #FFFFFF">2022</div>
...@@ -33,19 +36,19 @@ ...@@ -33,19 +36,19 @@
<div class="bottomContent"> <div class="bottomContent">
<div class="experimentType"> <div class="experimentType">
<div>分组实验</div> <div>分组实验</div>
<div style="color:#4ea0fc;">6</div> <div style="color:#4ea0fc;">{{ item.fzcount }}</div>
</div> </div>
<div class="experimentType"> <div class="experimentType">
<div>演示实验</div> <div>演示实验</div>
<div style="color:#4ea0fc;">6</div> <div style="color:#4ea0fc;">{{ item.sycount }}</div>
</div> </div>
<div class="experimentType"> <div class="experimentType">
<div>探究实验</div> <div>探究实验</div>
<div style="color:#4ea0fc;">6</div> <div style="color:#4ea0fc;">{{ item.sjcount }}</div>
</div> </div>
<div class="experimentType"> <div class="experimentType">
<div>已完成实验数</div> <div>已完成实验数</div>
<div style="color:#4ea0fc;">6</div> <div style="color:#4ea0fc;">{{ item.count }}</div>
</div> </div>
</div> </div>
...@@ -58,15 +61,29 @@ ...@@ -58,15 +61,29 @@
</template> </template>
<script setup> <script setup>
import { reactive, onMounted, toRefs, ref } from "vue"; import {getTeacherLabList, getNewSchoolYear} from '@/service/laboratoryManagement'
import { useStore } from "vuex"; import {reactive, onMounted, toRefs, ref} from "vue";
import { useRouter, useRoute } from "vue-router"; import {useStore} from "vuex";
import { formatDate } from "@/utils/time"; import {useRouter, useRoute} from "vue-router";
import {formatDate} from "@/utils/time";
import {Toast} from "vant"; import {Toast} from "vant";
const store = useStore(); const store = useStore();
const router = useRouter() const router = useRouter();
const semester = ref('');
const year = ref('');
const applyName = ref('');
//选中学年的参数
const handleSelect = (value) => {
console.log('handleSelect', value)
year.value = value[0];
semester.value = value[1];
onLoad()
}
//列表数据 //列表数据
const list = ref([1,2,3]); const list = ref([]);
//loading 和 finished 两个变量控制加载状态 //loading 和 finished 两个变量控制加载状态
//当组件滚动到底部时，会触发 load 事件并将 loading 设置成 true。 //当组件滚动到底部时，会触发 load 事件并将 loading 设置成 true。
//此时可以发起异步操作并更新数据，数据更新完毕后，将 loading 设置成 false 即可。 //此时可以发起异步操作并更新数据，数据更新完毕后，将 loading 设置成 false 即可。
...@@ -74,45 +91,42 @@ const list = ref([1,2,3]); ...@@ -74,45 +91,42 @@ const list = ref([1,2,3]);
const loading = ref(false); const loading = ref(false);
const finished = ref(false); const finished = ref(false);
const refreshing = ref(false); const refreshing = ref(false);
const searchValue = ref('');
//权限字段
const rolesArr = store.state.userInfo.roles
// 领导权限
const leaderRole = ref()
//实验室管理员
const managerRole = ref()
//级部
const levelPartRole = ref()
//教师
const teacherRole = ref()
//查找角色
// rolesArr.find(item => {
// if(item == ''){
// return leaderRole.value = true
// }else{
// leaderRole.value = false
// }
// })
onMounted(async () => {
})
//列表加载事件 //列表加载事件
const onLoad = () => { const onLoad = async () => {
if (refreshing.value) { if (refreshing.value) {
list.value = []; list.value = [];
refreshing.value = false; refreshing.value = false;
} }
console.log('semester.value',semester.value)
if(semester.value == '上学期' ||semester.value == '1' ){
semester.value = '1'
}else{
semester.value = '2'
}
const params = {
schoolYear: year.value,
semester: semester.value,
applyName: applyName.value
}
console.log('params', params)
//接口 //接口
// let result = await getBorrowList(id,equipmentName.value) let result = await getTeacherLabList(params)
// console.log('result',result) console.log('result', result)
// if(result.code == 200){ if (result.code == 200) {
// loading.value = false; loading.value = false;
// list.value = result.data list.value = result.data
// finished.value = true finished.value = true
// }else{ } else {
// Toast("获取信息失败!"); Toast("获取信息失败!");
// finished.value = true; finished.value = true;
// loading.value = false; loading.value = false;
// return; return;
// } }
} }
//下拉刷新 //下拉刷新
...@@ -126,7 +140,7 @@ const onRefresh = () => { ...@@ -126,7 +140,7 @@ const onRefresh = () => {
}; };
//搜索 //搜索
const onSearch = (val) => { const onSearch = (val) => {
onLoad()
}; };
//取消 //取消
const onCancel = () => { const onCancel = () => {
...@@ -139,24 +153,31 @@ const goback = () => { ...@@ -139,24 +153,31 @@ const goback = () => {
</script> </script>
<style scoped> <style scoped>
.card{ .card {
background: #FFFFFF; background: #FFFFFF;
margin: 10px; margin: 10px;
border-radius: 20px;
} }
.topContent{
.topContent {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
justify-content: space-between; justify-content: space-between;
padding-top: 15px; padding-top: 15px;
padding-bottom: 10px; padding-bottom: 10px;
border-bottom:1px solid #6f787d ; border-bottom: 1px solid #aebdc5;
margin-left: 10px;
margin-right: 10px;
} }
.topLeft{
.topLeft {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
} }
.topRight{
.topRight {
margin-top: -5px; margin-top: -5px;
text-align: center; text-align: center;
width: 50px; width: 50px;
...@@ -165,18 +186,21 @@ const goback = () => { ...@@ -165,18 +186,21 @@ const goback = () => {
border-radius: 10px; border-radius: 10px;
background: #4ea0fc; background: #4ea0fc;
} }
.bottomContent{
.bottomContent {
margin-top: 10px; margin-top: 10px;
padding-bottom: 10px; padding-bottom: 10px;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
justify-content: space-around; justify-content: space-around;
} }
.experimentType{
.experimentType {
justify-content: center; justify-content: center;
align-items: center; align-items: center;
font-size: 14px; font-size: 14px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
} }
</style> </style>
src/views/teacher/laboratoryManagement/levelPart/checkGradeLaboratoryComplete.vue 0 → 100644
<template>
<van-nav-bar title="查看班级完成情况" left-text="返回" left-arrow @click-left="goback" ></van-nav-bar>
<div>
<!-- 搜索框 -->
<form action="/">
<van-search
v-model="searchValue"
show-action
placeholder="搜索班级、实验时间"
@search="onSearch"
@cancel="onCancel"
/>
</form>
<!--列表 -->
<van-pull-refresh v-model="refreshing" @refresh="onRefresh">
<van-list
v-model:loading="loading"
:finished="finished"
finished-text="没有更多了"
@load="onLoad"
>
<div v-for="(item,index) in list" :key="index">
<div class="card">
<div class="title">
<van-image v-if="item.sub == '1'" style="height: 20px;width: 20px;vertical-align: middle" :src="require('../../../../assets/icon/physics.png')"></van-image>
<van-image v-if="item.sub == '3'" style="height: 20px;width: 20px;vertical-align: middle" :src="require('../../../../assets/icon/biology.png')"></van-image>
<van-image v-if="item.sub == '2'" style="height: 20px;width: 20px;vertical-align: middle" :src="require('../../../../assets/icon/chemistry.png')"></van-image>
<span style="font-size: 16px;font-weight: bold;padding-left: 5px">{{item.sub == '1' ? '物理' : item.sub == '2' ? '化学' : '生物'}}研究</span>
</div>
<div class="form">
<van-form>
<van-cell-group inset>
<van-field
readonly
v-model="item.sub"
label="学科"
/>
<van-field
readonly
v-model="item.section"
label="节次"
/>
<van-field
readonly
v-model="item.experimentName"
label="实验名称"
/>
<van-field
readonly
v-model="item.experimentClassify"
label="实验分类"
/>
<van-field
readonly
v-model="item.chapterContent"
label="章节内容"
/>
<van-field
readonly
v-model="item.experimentTime"
label="实验时间"
/>
</van-cell-group>
</van-form>
</div>
</div>
</div>
</van-list>
</van-pull-refresh>
</div>
</template>
<script setup>
import {getClassCompleteDetail} from '@/service/laboratoryManagement'
import { reactive, onMounted, toRefs, ref } from "vue";
import { useStore } from "vuex";
import { useRouter, useRoute } from "vue-router";
import { formatDate } from "@/utils/time";
import {Toast} from "vant";
const store = useStore();
const router = useRouter();
const route = useRoute();
//列表数据
const list = ref([]);
//loading 和 finished 两个变量控制加载状态
//当组件滚动到底部时，会触发 load 事件并将 loading 设置成 true。
//此时可以发起异步操作并更新数据，数据更新完毕后，将 loading 设置成 false 即可。
// 若数据已全部加载完毕，则直接将 finished 设置成 true 即可。
const loading = ref(false);
const finished = ref(false);
const refreshing = ref(false);
const username = ref('')
const searchValue = ref('');
onMounted(()=>{
// onLoad()
})
//列表加载事件
const onLoad = async () => {
if (refreshing.value) {
list.value = [];
refreshing.value = false;
}
const params = {
schoolYear:route.query.schoolYear,
semester:route.query.semester,
classId:route.query.id,
querText:searchValue.value
}
//接口
let result = await getClassCompleteDetail(params)
console.log('result',result)
if(result.code == 200){
loading.value = false;
list.value = result.data.map(item => {
return{
sub: item.sub == '1' ? '物理' : item.sub == '2' ? '化学' : '生物',
section:item.section,
experimentClassify:item.experimentClassify == '1' ? '分组实验' : item.experimentClassify == '2' ? '演示实验' : '探究实验' ,
chapterContent:item.chapterContent,
experimentTime:item.experimentTime,
experimentName:item.experimentName
}
})
finished.value = true
}else {
Toast("获取信息失败!");
finished.value = true;
loading.value = false;
return;
}
}
//下拉刷新
const onRefresh = () => {
//// 清空列表数据
finished.value = false;
// 重新加载数据
// 将 loading 设置为 true，表示处于加载状态
loading.value = true;
onLoad()
};
//搜索
const onSearch = (val) => {
onLoad()
};
//取消
const onCancel = () => {
onLoad()
};
//返回上一页
const goback = () => {
router.back();
}
</script>
<style scoped>
.card{
background: #FFFFFF;
margin: 10px;
border-radius: 20px;
}
.title{
padding: 10px 20px;
}
</style>
src/views/teacher/laboratoryManagement/levelPart/checkLaboratoryComplete.vue 0 → 100644
<!--级部申请-班级完成情况明细-->
<template>
<van-nav-bar title="查看实验室完成情况" left-text="返回" left-arrow @click-left="goback" ></van-nav-bar>
<div>
<!-- 搜索框 -->
<form action="/">
<van-search
v-model="searchValue"
show-action
placeholder="搜索班级、实验时间"
@search="onSearch"
@cancel="onCancel"
/>
</form>
<!--列表 -->
<van-pull-refresh v-model="refreshing" @refresh="onRefresh">
<van-list
v-model:loading="loading"
:finished="finished"
finished-text="没有更多了"
@load="onLoad"
>
<div v-for="(item,index) in list" :key="index">
<div class="card">
<div style="margin-left: 15px;margin-top: 20px;" class="left">
<div style="margin-bottom: 5px;" class="title">
<van-icon size="20" name="apps-o" />
<span style="font-size: 16px;font-weight: bold;padding-left: 5px">{{item.schoolYear}}级{{item.className}}</span>
</div>
<div style="font-size: 14px;margin-bottom: 5px">
<span>实验时间：</span>
<span>{{ item.experimentTime }}</span>
</div>
<div style="font-size: 14px;padding-bottom: 10px">
<span>节次：</span>
<span>{{ item.section }}</span>
</div>
</div>
<div class="right">
<div v-if="item.state == '1'">完成</div>
<div v-if="item.state == '0'">未完成</div>
</div>
</div>
</div>
</van-list>
</van-pull-refresh>
</div>
</template>
<script setup>
import {getClassCompleteDetail} from '@/service/laboratoryManagement'
import { reactive, onMounted, toRefs, ref } from "vue";
import { useStore } from "vuex";
import { useRouter, useRoute } from "vue-router";
import { formatDate } from "@/utils/time";
import {Toast} from "vant";
const store = useStore();
const router = useRouter();
const route = useRoute()
//列表数据
const list = ref([]);
//loading 和 finished 两个变量控制加载状态
//当组件滚动到底部时，会触发 load 事件并将 loading 设置成 true。
//此时可以发起异步操作并更新数据，数据更新完毕后，将 loading 设置成 false 即可。
// 若数据已全部加载完毕，则直接将 finished 设置成 true 即可。
const loading = ref(false);
const finished = ref(false);
const refreshing = ref(false);
const searchValue = ref('');
//列表加载事件
const onLoad = async () => {
if (refreshing.value) {
list.value = [];
refreshing.value = false;
}
const params = {
schoolYear:route.query.schoolYear,
semester:route.query.semester,
classId:route.query.classId,
querText:searchValue.value
}
console.log('params',params)
//接口
let result = await getClassCompleteDetail(params)
console.log('result',result)
if(result.code == 200){
loading.value = false;
list.value = result.data
finished.value = true
}else{
Toast("获取信息失败!");
finished.value = true;
loading.value = false;
return;
}
}
//下拉刷新
const onRefresh = () => {
//// 清空列表数据
finished.value = false;
// 重新加载数据
// 将 loading 设置为 true，表示处于加载状态
loading.value = true;
onLoad()
};
//搜索
const onSearch = (val) => {
onLoad()
};
//取消
const onCancel = () => {
onLoad()
};
//返回上一页
const goback = () => {
router.back();
}
</script>
<style scoped>
.card{
background: #FFFFFF;
margin: 10px;
display: flex;
justify-content: space-between;
border-radius: 20px;
}
.right{
margin-top: 10px;
margin-right: 15px;
font-size: 14px;
background: #4ea0fc;
color: #FFFFFF;
height: 25px;
line-height: 25px;
text-align: center;
width: 60px;
border-radius: 8px;
}
</style>
src/views/teacher/laboratoryManagement/levelPart/gradeLaboratoryApprove.vue 0 → 100644
<!--级部申请-年级实验室预约-->
<template>
<van-nav-bar title="年级实验室预约列表" left-text="返回" left-arrow @click-left="goback" ></van-nav-bar>
<div style="display: flex;justify-content: space-between">
<!--学年/学期 -->
<schoolYear @select="handleSelect"></schoolYear>
<div style="margin-right: 20px;" @click="toAdd">
<van-icon size="15" color="#1989fa" name="add"/>
<span style="font-size: 14px;margin-left: 3px;">新增预约</span>
</div>
</div>
<div>
<van-pull-refresh v-model="refreshing" @refresh="onRefresh">
<!-- <form action="/">-->
<!-- <van-search-->
<!-- v-model="searchValue"-->
<!-- show-action-->
<!-- placeholder="请输入搜索关键词"-->
<!-- @search="onSearch"-->
<!-- @cancel="onCancel"-->
<!-- />-->
<!-- </form>-->
<van-list
v-model:loading="loading"
:finished="finished"
finished-text="没有更多了"
@load="onLoad"
>
<div v-for="(item,index) in list" :key="index" style="position: relative">
<div class="card" @click="toDetail(item.id)">
<div class="topContent">
<div>
<div class="topLeft">
<van-image v-if="item.sub == '1'" style="height: 20px;width: 20px;vertical-align: middle" :src="require('../../../../assets/icon/physics.png')"></van-image>
<van-image v-if="item.sub == '3'" style="height: 20px;width: 20px;vertical-align: middle" :src="require('../../../../assets/icon/biology.png')"></van-image>
<van-image v-if="item.sub == '2'" style="height: 20px;width: 20px;vertical-align: middle" :src="require('../../../../assets/icon/chemistry.png')"></van-image>
<span style="font-size: 16px;font-weight: bold;padding-left: 5px">{{item.sub == '1' ? '物理' : item.sub == '2' ? '化学' : '生物'}}研究</span>
</div>
<div class="subject">
<van-icon style="margin-right: 3px" name="bookmark-o" />
<span style="font-size: 14px;padding-left: 5px">{{item.sub == '1' ? '物理' : item.sub == '2' ? '化学' : '生物'}}</span>
</div>
<div class="year">
<van-icon style="margin-right: 3px" name="friends-o" />
<span style="font-size: 14px;padding-left: 5px">{{item.grade}}</span>
</div>
<div class="semester">
<van-image style="height: 16px;width: 16px;vertical-align:middle;margin-right: 3px; " :src="require('../../../../assets/icon/calendar.png')"></van-image>
<span style="font-size: 14px;padding-left: 5px">{{ item.schoolYear }}{{item.semester == '1' ? '上学期':'下学期'}}</span>
</div>
<div class="room" >
<van-icon style="margin-right: 3px" name="home-o" />
<span style="font-size: 14px;padding-left: 5px">{{ item.labName }}</span>
</div>
<div class="time">
<van-icon style="margin-right: 3px" name="clock-o" />
<span style="font-size: 14px;padding-left: 5px">{{ item.plannedStartTime }} - {{ item.plannedEndTime }}</span>
</div>
</div>
<div class="topRight">
<div >
<van-button v-if="item.declareState == '0'" type="warning" size="small" class="unsubmit">未提交</van-button>
<van-button v-if="item.declareState == '3'" type="primary" size="small" class="assigned">已分配</van-button>
<van-button v-if="item.declareState == '2'" type="primary" size="small" class="assigned">未分配</van-button>
<van-button v-if="item.declareState == '1'" color="#c67dce" size="small" class="unAssigned">已提交</van-button>
</div>
</div>
</div>
</div>
<div style="display: flex;flex-direction: column;position: absolute;bottom: 10px;right: 20px" v-if="item.declareState == '0'">
<van-button style="margin-bottom: 5px" color="#e38035" size="small" class="submitBtn" @click="handleSubmit(item.id)">提交</van-button>
<van-button style="margin-bottom: 5px" type="success" size="small" class="edit" @click="toEdit(item.id)">修改</van-button>
<van-button type="danger" size="small" class="delete" @click="handleDelete(item.id)">删除</van-button>
</div>
</div>
</van-list>
</van-pull-refresh>
</div>
</template>
<script setup>
import calendar from '../../../../assets/icon/calendar.png'
import book from '../../../../assets/icon/book.png'
import { getGradeApplyList,deleteGradeApply,submitLabAppointment } from '@/service/laboratoryManagement'
import { reactive, onMounted, toRefs, ref } from "vue";
import { useStore } from "vuex";
import { useRouter, useRoute } from "vue-router";
import { formatDate } from "@/utils/time";
import {Toast} from "vant";
const store = useStore();
const router = useRouter();
const semester = ref('');
const year = ref('');
const gradeId = store.state.gradeId
console.log('gradeId',gradeId)
//选中学年的参数
const handleSelect = (value) => {
console.log('handleSelect', value)
year.value = value[0];
semester.value = value[1];
onLoad()
}
//列表数据
const list = ref([]);
//loading 和 finished 两个变量控制加载状态
//当组件滚动到底部时，会触发 load 事件并将 loading 设置成 true。
//此时可以发起异步操作并更新数据，数据更新完毕后，将 loading 设置成 false 即可。
// 若数据已全部加载完毕，则直接将 finished 设置成 true 即可。
const loading = ref(false);
const finished = ref(false);
const refreshing = ref(false);
onMounted(async ()=>{
// let gradeId = await getGradeId()
console.log('gradeId',gradeId)
})
//列表加载事件
const onLoad = async () => {
if (refreshing.value) {
list.value = [];
refreshing.value = false;
}
console.log('semester.value',semester.value)
if(semester.value == '上学期' ||semester.value == '1' ){
semester.value = '1'
}else{
semester.value = '2'
}
const params = {
schoolYear: year.value,
semester: semester.value,
userId:store.state.userInfo.userId
}
console.log('params',params)
//接口
let result = await getGradeApplyList(params)
console.log('result',result)
if(result.code == 200){
loading.value = false;
list.value = result.data
finished.value = true
}else{
Toast("获取信息失败!");
finished.value = true;
loading.value = false;
return;
}
}
//下拉刷新
const onRefresh = () => {
//// 清空列表数据
finished.value = false;
// 重新加载数据
// 将 loading 设置为 true，表示处于加载状态
loading.value = true;
onLoad()
};
//搜索
const onSearch = (val) => {
onLoad()
};
//新增按钮
const toAdd = () =>{
router.push({
path: '/laboratoryManagement/gradeLaboratoryApprove/gradeLaboratoryDetail',
query:{
type:'新增',
schoolYear: year.value,
semester: semester.value,
}
})
}
//卡片点击事件
const toDetail = (id) =>{
router.push({
path: '/laboratoryManagement/gradeLaboratoryApprove/gradeLaboratoryDetail',
query:{
id:id,
type:'查看'
}
})
}
//修改按钮
const toEdit = (id) => {
router.push({
path: '/laboratoryManagement/gradeLaboratoryApprove/gradeLaboratoryDetail',
query:{
id:id,
type:'修改'
}
})
}
//提交按钮
const handleSubmit = async (id) => {
console.log('id',id)
const params = {
id:id
}
console.log('params',params)
let res = await submitLabAppointment(params)
console.log('res',res)
if(res.code == 200){
Toast("提交成功");
onLoad();
}
}
//删除按钮
const handleDelete = async (id) => {
console.log('id',id)
//id数组
// const arr = [];
// arr.push(id);
// console.log('arr',arr)
let res = await deleteGradeApply(id)
console.log('res',res)
if(res.code == 200){
Toast("删除成功");
onLoad();
}
}
//取消
const onCancel = () => {
onLoad()
};
//返回上一页
const goback = () => {
router.back();
}
</script>
<style scoped>
.card{
background: #FFFFFF;
margin: 10px;
border-radius: 20px;
}
.topContent{
display: flex;
flex-direction: row;
justify-content: space-between;
padding-top: 15px;
padding-bottom: 10px;
}
.topLeft,.subject,.year,.semester,.room,.time{
margin-left: 15px;
font-size: 16px;
margin-top: 5px;
/*display: flex;*/
/*align-items: center;*/
/*justify-content: center;*/
}
.topRight{
display: flex;
flex-direction: column;
justify-content: space-between;
margin-top: -5px;
text-align: center;
width: 80px;
/*height: 20px;*/
line-height: 25px;
color: #FFFFFF;
font-size: 14px;
/*margin-right: -10px;*/
}
.unsubmit{
border-radius: 10px;
height: 25px;
line-height: 25px;
width: 60px;
/*margin-bottom: 10px;*/
}
.unAssigned{
background: #c67dce;
border-radius: 10px;
height: 25px;
width: 60px;
line-height: 25px;
/*margin-bottom: 10px;*/
}
.assigned{
border-radius: 10px;
height: 25px;
width: 60px;
line-height: 25px;
/*margin-bottom: 10px;*/
}
.submitBtn{
width: 60px;
border-radius: 10px;
height: 25px;
line-height: 25px;
/*background: #e38035;*/
/*color: #FFFFFF;*/
}
.edit{
width: 60px;
border-radius: 10px;
height: 25px;
line-height: 25px;
/*margin-bottom: 10px;*/
}
.delete{
border-radius: 10px;
height: 25px;
line-height: 25px;
width: 60px;
}
.bottomContent,.middleContent{
font-size: 14px;
margin: 10px 20px;
padding-bottom: 10px;
display: flex;
flex-direction: row;
/*justify-content: space-between;*/
color: #6f787d;
}
.middleContent{
border-bottom: 1px solid silver;
}
.experimentType{
justify-content: center;
align-items: center;
font-size: 14px;
display: flex;
flex-direction: column;
}
.van-cell.van-field.schoolYear{
padding: 0px!important;
height: 30px;
line-height: 30px;
}
.schoolYear{
font-size:12px;
width: 165px;
height: 30px;
margin-top: 5px;
margin-left: 20px;
border: 1px solid silver;
border-radius: 5px
}
</style>
src/views/teacher/laboratoryManagement/levelPart/gradeLaboratoryComplete.vue 0 → 100644
<!--级部申请-班级完成情况明细-->
<template>
<van-nav-bar title="班级完成情况明细" left-text="返回" left-arrow @click-left="goback" ></van-nav-bar>
<div>
<!-- 搜索框 -->
<!-- <form action="/">-->
<!-- <van-search-->
<!-- v-model="searchValue"-->
<!-- show-action-->
<!-- placeholder="搜索班级等"-->
<!-- @search="onSearch"-->
<!-- @cancel="onCancel"-->
<!-- />-->
<!-- </form>-->
<!--学年/学期 -->
<schoolYear @select="handleSelect"></schoolYear>
<!--列表 -->
<van-pull-refresh v-model="refreshing" @refresh="onRefresh">
<van-list
v-model:loading="loading"
:finished="finished"
finished-text="没有更多了"
@load="onLoad"
>
<div v-for="(item,index) in list" :key="index">
<div class="card" @click="toCheckComplete(item.classId)">
<div class="topContent">
<div class="topLeft">
<van-icon size="18" name="diamond-o" />
<span style="font-size: 16px;font-weight: bold;padding-left: 5px">{{ item.schoolYear }}{{item.semester == '1' ? '上学期':'下学期'}}</span>
</div>
<div class="topRight">
<div style="font-size: 16px;font-weight: bold">{{ item.schoolYear }}级{{ item.className }}</div>
</div>
</div>
<div class="bottomContent">
<div class="experimentType">
<div>计划实验数</div>
<div style="color:#4ea0fc;">{{ item.count }}</div>
</div>
<div class="experimentType">
<div>已完成实验数</div>
<div style="color:#4ea0fc;">{{ item.complete }}</div>
</div>
<div class="experimentType">
<div>完成比例</div>
<div style="color:#4ea0fc;">{{item.proportion}}%</div>
</div>
</div>
</div>
</div>
</van-list>
</van-pull-refresh>
</div>
</template>
<script setup>
import {getClassCompleteList} from '@/service/laboratoryManagement'
import { reactive, onMounted, toRefs, ref } from "vue";
import { useStore } from "vuex";
import { useRouter, useRoute } from "vue-router";
import { formatDate } from "@/utils/time";
import {Toast} from "vant";
const store = useStore();
const router = useRouter()
//列表数据
const list = ref([]);
//loading 和 finished 两个变量控制加载状态
//当组件滚动到底部时，会触发 load 事件并将 loading 设置成 true。
//此时可以发起异步操作并更新数据，数据更新完毕后，将 loading 设置成 false 即可。
// 若数据已全部加载完毕，则直接将 finished 设置成 true 即可。
const loading = ref(false);
const finished = ref(false);
const refreshing = ref(false);
// const searchValue = ref('');
const semester = ref('');
const year = ref('');
const gradeId = store.state.gradeId
console.log('store123',store.state.gradeId)
//选中学年的参数
const handleSelect = (value) => {
console.log('handleSelect', value)
year.value = value[0];
semester.value = value[1];
onLoad()
}
//列表加载事件
const onLoad = async () => {
if (refreshing.value) {
list.value = [];
refreshing.value = false;
}
console.log('semester.value',semester.value)
if(semester.value == '上学期' ||semester.value == '1' ){
semester.value = '1'
}else{
semester.value = '2'
}
const params = {
schoolYear: year.value,
semester: semester.value,
gradeId:gradeId
}
console.log('params',params)
//接口
let resultList = await getClassCompleteList(params)
console.log('resultList',resultList)
if(resultList.code == 200){
loading.value = false;
list.value = resultList.data
finished.value = true
}else{
Toast("获取信息失败!");
finished.value = true;
loading.value = false;
return;
}
}
//下拉刷新
const onRefresh = () => {
//// 清空列表数据
finished.value = false;
// 重新加载数据
// 将 loading 设置为 true，表示处于加载状态
loading.value = true;
onLoad()
};
//取消
const onCancel = () => {
onLoad()
};
//点击卡片查看按钮
const toCheckComplete =(classId) => {
router.push({
path: '/laboratoryManagement/gradeLaboratoryComplete/checkGradeLaboratoryComplete',
query:{
id:classId,
schoolYear:year.value,
semester:semester.value
}
})
}
//返回上一页
const goback = () => {
router.back();
}
</script>
<style scoped>
.card{
background: #FFFFFF;
margin: 10px;
border-radius: 20px;
}
.topContent{
display: flex;
flex-direction: row;
justify-content: space-between;
padding-top: 15px;
padding-bottom: 10px;
border-bottom:1px solid #aebdc5 ;
margin-left: 10px;
margin-right: 10px;
}
.topLeft{
display: flex;
align-items: center;
justify-content: center;
}
.topRight{
}
.bottomContent{
margin-top: 10px;
padding-bottom: 10px;
display: flex;
flex-direction: row;
justify-content: space-around;
}
.experimentType{
justify-content: center;
align-items: center;
font-size: 14px;
display: flex;
flex-direction: column;
}
.schoolYearNew{
font-size:12px;
width: 165px;
height: 30px;
margin-top: 5px;
margin-left: 20px;
border: 1px solid silver;
border-radius: 5px
}
.van-cell.van-field.schoolYearNew{
padding: 0px!important;
height: 30px;
line-height: 30px;
}
</style>
src/views/teacher/laboratoryManagement/levelPart/gradeLaboratoryDetail.vue 0 → 100644
<!--级部申请-年级实验室预约-详情-->
<template>
<van-nav-bar :title=title left-text="返回" left-arrow @click-left="goback" ></van-nav-bar>
<div class="topTitle">实验信息
</div>
<van-form @submit="onSubmit">
<van-cell-group v-if="type == '查看'" inset>
<van-field
v-model="form.sub"
readonly
label="学科"
/>
<van-field
readonly
v-model="form.grade"
label="级部"
/>
<van-field
readonly
v-model="form.semester"
label="学期"
/>
<van-field
readonly
v-model="form.experimentName"
label="实验名称"
/>
<van-field
readonly
v-model="form.experimentClassify"
label="实验分类"
/>
<van-field
readonly
v-model="form.labName"
label="实验室"
/>
<van-field
readonly
v-model="form.chapterContent"
label="章节内容"
/>
<van-field
readonly
v-model="form.planTime"
label="计划时间"
/>
<div style="margin: 10px">
<div style="font-size: 16px;margin: 8px;font-size: 14px;color: #646566">实验用品</div>
<van-field
readonly
style="border: 1px solid #ebedf0;border-radius: 10px"
name="message"
v-model="form.experimentUseGoods"
rows="3"
autosize
type="textarea"
/>
</div>
</van-cell-group>
<van-cell-group v-else inset>
<van-field
v-model="form.experimentName"
is-link
readonly
name="picker"
label="实验名称"
placeholder="选择实验名称"
@click="showPickerLabName = true"
:rules="[{ required: true, message: '请选择实验名称' }]"
/>
<van-popup v-model:show="showPickerLabName" position="bottom">
<van-picker
:columns="columnsLab"
@confirm="onConfirmLabName"
@cancel="showPickerLabName = false"
/>
</van-popup>
<van-field
readonly
v-model="form.experimentClassify"
label="实验分类"
/>
<van-field
readonly
v-model="form.chapterContent"
label="章节内容"
/>
<van-field
v-model="form.sub"
readonly
label="学科"
/>
<van-field
readonly
v-model="form.grade"
label="级部"
/>
<van-field
readonly
v-model="form.semester"
label="学期"
/>
<van-field
v-model="form.labName"
is-link
readonly
name="picker"
label="实验室"
placeholder="选择实验室"
@click="showPickerLab = true"
:rules="[{ required: true, message: '请选择实验室' }]"
/>
<van-popup v-model:show="showPickerLab" position="bottom">
<van-picker
:columns="columnsLabName"
@confirm="onConfirmLab"
@cancel="showPickerLab = false"
/>
</van-popup>
<van-field
v-model="form.plannedStartTime"
is-link
readonly
name="plannedStartTime"
label="计划开始时间"
placeholder="选择计划开始时间"
@click="showPickerTimeStart = true"
:rules="[{ required: true, message: '请选择计划开始时间' }]"
/>
<van-calendar v-model:show="showPickerTimeStart" @confirm="onConfirmTimeStart" />
<!-- <van-field-->
<!-- v-model="form.plannedStartTime"-->
<!-- is-link-->
<!-- readonly-->
<!-- name="datetimePicker"-->
<!-- label="计划开始时间"-->
<!-- placeholder="选择计划开始时间"-->
<!-- @click="showPickerTimeStart = true"-->
<!-- :rules="[{ required: true, message: '请选择计划开始时间' }]"-->
<!-- />-->
<!-- <van-popup v-model:show="showPickerTimeStart" position="bottom">-->
<!-- <van-datetime-picker-->
<!-- v-model="defaultStartTime"-->
<!-- type="datetime"-->
<!-- title="选择完整时间"-->
<!-- @confirm="onConfirmTimeStart"-->
<!-- @cancel="showPickerTimeStart = false"-->
<!-- />-->
<!-- </van-popup>-->
<van-field
v-model="form.plannedEndTime"
is-link
readonly
name="plannedStartTime"
label="计划结束时间"
placeholder="选择计划结束时间"
@click="showPickerTimeEnd = true"
:rules="[{ required: true, message: '请选择计划结束时间' }]"
/>
<van-calendar v-model:show="showPickerTimeEnd" @confirm="onConfirmTimeEnd" />
<!-- <van-field-->
<!-- v-model="form.plannedEndTime"-->
<!-- is-link-->
<!-- readonly-->
<!-- name="datetimePicker"-->
<!-- label="计划结束时间"-->
<!-- placeholder="选择计划结束时间"-->
<!-- @click="showPickerTimeEnd = true"-->
<!-- :rules="[{ required: true, message: '请选择计划结束时间' }]"-->
<!-- />-->
<!-- <van-popup v-model:show="showPickerTimeEnd" position="bottom">-->
<!-- <van-datetime-picker-->
<!-- v-model="defaultEndTime"-->
<!-- type="datetime"-->
<!-- title="选择完整时间"-->
<!-- @confirm="onConfirmTimeEnd"-->
<!-- @cancel="showPickerTimeEnd = false"-->
<!-- />-->
<!-- </van-popup>-->
<div style="margin: 10px">
<div style="font-size: 16px;margin: 8px;font-size: 14px;color: #646566">实验用品</div>
<van-field
:readonly="type == '查看' ? true : false"
style="border: 1px solid #ebedf0;border-radius: 10px"
name="message"
v-model="form.experimentUseGoods"
rows="3"
autosize
type="textarea"
/>
</div>
</van-cell-group>
<div v-if="type == '查看'" style="margin: 16px;">
<van-button round block type="primary" @click="goback">
关闭
</van-button>
</div>
<div v-else style="margin: 20px;display: flex;justify-content: center">
<van-button style="margin-right: 50px;width: 90px;height: 30px" round type="primary" native-type="submit">
同意
</van-button>
<van-button style="width: 90px;height: 30px" round type="success" @click="goback">
取消
</van-button>
</div>
</van-form>
</template>
<script setup>
import {getLabList, addGradeApply,editGradeApply,getGradeApplyDetail, getApproveDetail,getexperimentPlanList } from '@/service/laboratoryManagement'
import { reactive, onMounted, toRefs, ref } from "vue";
import { useStore } from "vuex";
import { useRouter, useRoute } from "vue-router";
import { formatDate } from "@/utils/time";
import {Toast} from "vant";
const store = useStore();
const router = useRouter();
const route = useRoute();
const title = ref('');
const form = reactive({
sub:'',
grade:'',
semester:'',
experimentName:'',
experimentClassify:'',
labName:'',
chapterContent:'',
planTime:'',
experimentUseGoods:'',
plannedStartTime:'',
plannedEndTime:'',
})
const type = route.query.type
const columnsLabName = ref([])
const columnsLab = ref([])
onMounted(async () => {
//实验名称下拉框
const params = {
schoolYear:route.query.schoolYear,
semester:route.query.semester
}
let labName = await getexperimentPlanList(params)
if(labName.code == 200){
columnsLab.value = labName.data.map(item => {
return{
text:item.experiment_name,
value:item.id
}
})
}
console.log('columnsLab.value',columnsLab.value)
//实验室下拉框
let labResult = await getLabList()
console.log('labResult',labResult)
if(labResult.code == 200){
columnsLabName.value = labResult.rows.map(item => {
return{
text:item.labName,
value:item.id
}
})
console.log('columnsLabName.value',columnsLabName.value)
}
if(type == '查看' ){
title.value = '年级实验室预约查看'
let result = await getApproveDetail(route.query.id)
console.log('查看',result)
if(result.code == 200){
Object.assign(form,result.data)
// form.planTime = result.data.plannedStartTime + '-' + result.data.plannedEndTime;
form.sub = form.sub == '1' ? '物理' : form.sub == '2' ? '化学' : '生物';
form.semester = form.semester == '1' ? '上学期' : '下学期';
form.experimentClassify = form.experimentClassify == '1' ? '分组实验': form.experimentClassify == '2' ? '演示实验' : '探究实验';
form.planTime = result.data.plannedStartTime + '-' + result.data.plannedEndTime
}
}
if(type == '修改'){
title.value = '年级实验室预约修改'
let result = await getApproveDetail(route.query.id)
console.log('修改',result)
if(result.code == 200){
Object.assign(form,result.data)
// form.planTime = result.data.plannedStartTime + '-' + result.data.plannedEndTime;
form.sub = form.sub == '1' ? '物理' : form.sub == '2' ? '化学' : '生物';
form.semester = form.semester == '1' ? '上学期' : '下学期';
form.experimentClassify = form.experimentClassify == '1' ? '分组实验': form.experimentClassify == '2' ? '演示实验' : '探究实验';
}
}
if(type == '新增'){
//新增，清空表单
title.value = '年级实验室预约新增'
form.experimentName = '';
form.experimentClassify = '';
form.chapterContent = '';
form.sub = '';
form.grade = '';
form.semester = '';
form.labName = '';
form.plannedStartTime = '';
form.plannedEndTime = '';
form.experimentUseGoods = '';
}
})
//实验名称下拉选择
const experimentNameId= ref('')
const showPickerLabName = ref(false);
// const columnsLabName = ['杭州', '宁波', '温州', '嘉兴', '湖州'];
const onConfirmLabName = async (value) => {
console.log('value',value)
form.experimentName = value.text;
experimentNameId.value = value.value;
showPickerLabName.value = false;
let result = await getGradeApplyDetail(value.value)
console.log('result',result)
Object.assign(form,result.data)
form.sub = form.sub == '1' ? '物理' : form.sub == '2' ? '化学' : '生物';
form.semester = form.semester == '1' ? '上学期' : '下学期';
form.experimentClassify = form.experimentClassify == '1' ? '分组实验': form.experimentClassify == '2' ? '演示实验' : '探究实验';
};
//实验室下拉选择
const labNameId = ref('')
const showPickerLab = ref(false);
const onConfirmLab = (value) =>{
console.log('value',value)
form.labName = value.text;
labNameId.value = value.value;
showPickerLab.value = false
}
//日期补0
const Appendzero = (obj) => {
/* 月日 一位数补零 1 到01 */
if (obj < 10) return "0" + obj;
else return obj;
};
const defaultStartTime = ref(new Date(new Date().getFullYear(),0,1))
const defaultEndTime = ref(new Date(new Date().getFullYear(),0,1));
//计划开始时间选择
const currentDate = ref('')
const showPickerTimeStart = ref(false);
const onConfirmTimeStart = (date) => {
// console.log('date',date)
// let y = date.getFullYear();
// let m = Appendzero(date.getMonth() + 1);
// let d = Appendzero(date.getDate());
// let hh = Appendzero(date.getHours());
// let mm = Appendzero(date.getMinutes());
// console.log('y', y + "-" + m + "-" + d + '\xa0\xa0\xa0' +hh + ":" + mm)
// form.plannedStartTime = y + "-" + m + "-" + d + '\xa0\xa0\xa0' +hh + ":" + mm;、
form.plannedStartTime = `${date.getFullYear()}-${Appendzero(date.getMonth() + 1)}-${Appendzero(date.getDate())}`;
showPickerTimeStart.value = false;
};
// 计划结束时间
const currentDate1 = ref('')
const showPickerTimeEnd = ref(false);
const onConfirmTimeEnd = (date) => {
// console.log('date',date)
// let y = date.getFullYear();
// let m = Appendzero(date.getMonth() + 1);
// let d = Appendzero(date.getDate());
// let hh = Appendzero(date.getHours());
// let mm = Appendzero(date.getMinutes());
// console.log('y',y)
// form.plannedEndTime = y + "-" + m + "-" + d + '\xa0\xa0\xa0' +hh + ":" + mm;
form.plannedEndTime = `${date.getFullYear()}-${Appendzero(date.getMonth() + 1)}-${Appendzero(date.getDate())}`;
showPickerTimeEnd.value = false;
};
//提交按钮
const onSubmit = async () => {
if(type == '新增'){
const data = {
experimentPlanId:form.id,
grade:form.grade,
gradeId:form.gradeId,
schoolYear:form.schoolYear,
semester:form.semester == '上学期' ? '1':'2' ,
sub:form.sub == '物理' ? '1' : form.sub == '化学' ? '2' : '3',
experimentClassify:form.experimentClassify == '分组实验'? '1' : form.experimentClassify == '演示实验' ? '2' : '3',
plannedStartTime:form.plannedStartTime,
plannedEndTime:form.plannedEndTime,
chapterContent:form.chapterContent,
experimentUseGoods:form.experimentUseGoods,
declareState:'0',
applyId:store.state.userInfo.userId,
applyName:store.state.userInfo.teacherName,
applyTime:formatDate(new Date()),
}
//新增
console.log('新增',data)
let addRes = await addGradeApply(data)
console.log('addRes',addRes)
if(addRes.code == 200){
Toast('新增成功')
router.back()
}
}else{
const data = {
id:route.query.id,
experimentPlanId:form.id,
grade:form.grade,
gradeId:form.gradeId,
schoolYear:form.schoolYear,
semester:form.semester == '上学期' ? '1':'2' ,
sub:form.sub == '物理' ? '1' : form.sub == '化学' ? '2' : '3',
experimentClassify:form.experimentClassify == '分组实验'? '1' : form.experimentClassify == '演示实验' ? '2' : '3',
plannedStartTime:form.plannedStartTime,
plannedEndTime:form.plannedEndTime,
chapterContent:form.chapterContent,
experimentUseGoods:form.experimentUseGoods,
declareState:'0',
applyId:store.state.userInfo.userId,
applyName:store.state.userInfo.teacherName,
applyTime:formatDate(new Date()),
}
//修改
console.log('修改',data)
let editRes = await editGradeApply(data)
console.log('editRes',editRes)
if(editRes.code == 200){
Toast('修改成功')
router.back()
}
}
}
//返回上一页
const goback = () => {
router.back();
}
</script>
<style scoped>
</style>
src/views/teacher/laboratoryManagement/laboratoryCompleteStatistics.vue → src/views/teacher/laboratoryManagement/levelPart/laboratoryCompleteDetail.vue
<!--领导--> <!--级部申请-实验室完成情况明细-->
<template> <template>
<van-nav-bar title="实验室完成情况" left-text="返回" left-arrow @click-left="goback" ></van-nav-bar> <van-nav-bar title="实验室完成情况明细" left-text="返回" left-arrow @click-left="goback" ></van-nav-bar>
<div> <div>
<!-- 搜索框 -->
<form action="/">
<van-search
v-model="searchValue"
show-action
placeholder="搜索实验等"
@search="onSearch"
@cancel="onCancel"
/>
</form>
<!--学年/学期 -->
<schoolYear @select="handleSelect"></schoolYear>
<!--列表 -->
<van-pull-refresh v-model="refreshing" @refresh="onRefresh"> <van-pull-refresh v-model="refreshing" @refresh="onRefresh">
<form action="/">
<van-search
v-model="searchValue"
show-action
placeholder="请输入搜索关键词"
@search="onSearch"
@cancel="onCancel"
/>
</form>
<van-list <van-list
v-model:loading="loading" v-model:loading="loading"
:finished="finished" :finished="finished"
...@@ -19,33 +24,39 @@ ...@@ -19,33 +24,39 @@
@load="onLoad" @load="onLoad"
> >
<div v-for="(item,index) in list" :key="index"> <div v-for="(item,index) in list" :key="index">
<div class="card" @click="toCheckComplete(item.id)"> <div class="card" @click="toCheckComplete(item.classId)">
<div class="topContent"> <div class="topContent">
<div class="topLeft"> <div class="topLeft">
<van-image :src="require('../../../assets/icon/laboratory.png')"></van-image> <van-image v-if="item.sub == '1'" style="height: 20px;width: 20px;vertical-align: middle" :src="require('../../../../assets/icon/physics.png')"></van-image>
<span style="font-size: 16px;font-weight: bold;padding-left: 5px">生物研究</span> <van-image v-if="item.sub == '3'" style="height: 20px;width: 20px;vertical-align: middle" :src="require('../../../../assets/icon/biology.png')"></van-image>
<van-image v-if="item.sub == '2'" style="height: 20px;width: 20px;vertical-align: middle" :src="require('../../../../assets/icon/chemistry.png')"></van-image>
<span style="font-size: 16px;font-weight: bold;padding-left: 5px">{{item.sub == '1' ? '物理' : item.sub == '2' ? '化学' : '生物'}}研究</span>
</div> </div>
<div class="topRight"> <div class="topRight">
<div style="font-size: 14px;color: #FFFFFF">2023下学期</div> <div style="font-size: 16px;font-weight: bold">{{ item.schoolYear }}{{item.semester == '1' ? '上学期':'下学期'}}</div>
</div> </div>
</div> </div>
<div class="bottomContent"> <div class="bottomContent">
<div class="experimentType"> <div class="experimentType">
<div>级部</div> <div>级部</div>
<div style="color:#4ea0fc;">2022级</div> <div style="color:#4ea0fc;">{{ item.grade }}</div>
</div> </div>
<div class="experimentType"> <div class="experimentType">
<div>总班级数</div> <div>总班级数</div>
<div style="color:#4ea0fc;">20个</div> <div style="color:#4ea0fc;">{{ item.count }}</div>
</div> </div>
<div class="experimentType"> <div class="experimentType">
<div>已完成班级数</div> <div>已完成班级数</div>
<div style="color:#4ea0fc;">10个</div> <div style="color:#4ea0fc;">{{ item.complete }}</div>
</div> </div>
<div class="experimentType"> <div class="experimentType">
<div>未完成班级数</div> <div>未完成班级数</div>
<div style="color:#4ea0fc;">20个</div> <div style="color:#4ea0fc;">{{ item.incomplete }}</div>
</div>
<div class="experimentType">
<div>完成比例</div>
<div style="color:#4ea0fc;">{{ item.proportion }}%</div>
</div> </div>
</div> </div>
...@@ -58,15 +69,27 @@ ...@@ -58,15 +69,27 @@
</template> </template>
<script setup> <script setup>
import {getLabDetail} from '@/service/laboratoryManagement'
import { reactive, onMounted, toRefs, ref } from "vue"; import { reactive, onMounted, toRefs, ref } from "vue";
import { useStore } from "vuex"; import { useStore } from "vuex";
import { useRouter, useRoute } from "vue-router"; import { useRouter, useRoute } from "vue-router";
import { formatDate } from "@/utils/time"; import { formatDate } from "@/utils/time";
import {Toast} from "vant"; import {Toast} from "vant";
const store = useStore() const store = useStore();
const router = useRouter() const router = useRouter();
const semester = ref('');
const year = ref('');
const gradeId = store.state.gradeId
//选中学年的参数
const handleSelect = (value) => {
console.log('handleSelect', value)
year.value = value[0];
semester.value = value[1];
onLoad()
}
//列表数据 //列表数据
const list = ref([1,2,3]); const list = ref([]);
//loading 和 finished 两个变量控制加载状态 //loading 和 finished 两个变量控制加载状态
//当组件滚动到底部时，会触发 load 事件并将 loading 设置成 true。 //当组件滚动到底部时，会触发 load 事件并将 loading 设置成 true。
//此时可以发起异步操作并更新数据，数据更新完毕后，将 loading 设置成 false 即可。 //此时可以发起异步操作并更新数据，数据更新完毕后，将 loading 设置成 false 即可。
...@@ -75,56 +98,42 @@ const loading = ref(false); ...@@ -75,56 +98,42 @@ const loading = ref(false);
const finished = ref(false); const finished = ref(false);
const refreshing = ref(false); const refreshing = ref(false);
const searchValue = ref(''); const searchValue = ref('');
//权限字段
const rolesArr = store.state.userInfo.roles
// 领导权限
const leaderRole = ref()
//实验室管理员
const managerRole = ref()
//级部
const levelPartRole = ref()
//教师
const teacherRole = ref()
//查找角色
// rolesArr.find(item => {
// if(item == ''){
// return leaderRole.value = true
// }else{
// leaderRole.value = false
// }
// })
//列表加载事件 //列表加载事件
const onLoad = () => { const onLoad = async () => {
if (refreshing.value) { if (refreshing.value) {
list.value = []; list.value = [];
refreshing.value = false; refreshing.value = false;
} }
console.log('semester.value',semester.value)
if(semester.value == '上学期' ||semester.value == '1' ){
semester.value = '1'
}else{
semester.value = '2'
}
const params = {
schoolYear: year.value,
semester: semester.value,
grade:searchValue.value,
experimentName:searchValue.value
}
console.log('params', params)
//接口 //接口
// let result = await getBorrowList(id,equipmentName.value) let result = await getLabDetail(params)
// console.log('result',result) console.log('result',result)
// if(result.code == 200){ if(result.code == 200){
// loading.value = false; loading.value = false;
// list.value = result.data list.value = result.data
// finished.value = true finished.value = true
// }else{ }else{
// Toast("获取信息失败!"); Toast("获取信息失败!");
// finished.value = true; finished.value = true;
// loading.value = false; loading.value = false;
// return; return;
// } }
} }
//点击事件
const toCheckComplete = (id) => {
console.log('111')
router.push({
path:'/laboratoryManagement/laboratoryCompleteStatistics/checkComplete',
query:{
id:id
}
})
}
//下拉刷新 //下拉刷新
const onRefresh = () => { const onRefresh = () => {
//// 清空列表数据 //// 清空列表数据
...@@ -142,6 +151,18 @@ const onSearch = (val) => { ...@@ -142,6 +151,18 @@ const onSearch = (val) => {
const onCancel = () => { const onCancel = () => {
onLoad() onLoad()
}; };
//点击卡片查看按钮
const toCheckComplete =(classId) => {
router.push({
path: '/laboratoryManagement/laboratoryCompleteDetail/checkLaboratoryComplete',
query:{
classId:classId,
schoolYear:year.value,
semester:semester.value,
}
})
}
//返回上一页 //返回上一页
const goback = () => { const goback = () => {
router.back(); router.back();
...@@ -152,6 +173,8 @@ const goback = () => { ...@@ -152,6 +173,8 @@ const goback = () => {
.card{ .card{
background: #FFFFFF; background: #FFFFFF;
margin: 10px; margin: 10px;
border-radius: 20px;
} }
.topContent{ .topContent{
display: flex; display: flex;
...@@ -159,7 +182,9 @@ const goback = () => { ...@@ -159,7 +182,9 @@ const goback = () => {
justify-content: space-between; justify-content: space-between;
padding-top: 15px; padding-top: 15px;
padding-bottom: 10px; padding-bottom: 10px;
border-bottom:1px solid #6f787d ; border-bottom:1px solid #aebdc5 ;
margin-left: 10px;
margin-right: 10px;
} }
.topLeft{ .topLeft{
display: flex; display: flex;
...@@ -167,13 +192,7 @@ const goback = () => { ...@@ -167,13 +192,7 @@ const goback = () => {
justify-content: center; justify-content: center;
} }
.topRight{ .topRight{
margin-top: -5px;
text-align: center;
width: 50px;
height: 20px;
line-height: 20px;
border-radius: 10px;
background: #4ea0fc;
} }
.bottomContent{ .bottomContent{
margin-top: 10px; margin-top: 10px;
...@@ -189,4 +208,19 @@ const goback = () => { ...@@ -189,4 +208,19 @@ const goback = () => {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
} }
.schoolYearNew{
font-size:12px;
width: 165px;
height: 30px;
margin-top: 5px;
margin-left: 20px;
border: 1px solid silver;
border-radius: 5px
}
.van-cell.van-field.schoolYearNew{
padding: 0px!important;
height: 30px;
line-height: 30px;
}
</style> </style>
src/views/teacher/laboratoryManagement/manager/applyTeacherApprove.vue 0 → 100644
<template>
</template>
<script>
export default {
name: "applyTeacherApprove"
}
</script>
<style scoped>
</style>
src/views/teacher/laboratoryManagement/manager/checkGradeComplete.vue 0 → 100644
<!-- 实验室管理员-年级实验预约列表-年级实验室分配-->
<!--实验室管理员-个人实验审批-实验室分配-->
<template>
<van-nav-bar :title=title left-text="返回" left-arrow @click-left="goback"></van-nav-bar>
<div class="topTitle">实验信息</div>
<van-form style="border-radius: 10px" @submit="onSubmit">
<van-cell-group inset>
<van-field
v-if="name == 'personal'"
readonly
v-model="formData.sub"
name="sub"
label="学科"
/>
<van-field
readonly
v-model="formData.grade"
name="grade"
label="级部"
/>
<van-field
v-if="name == 'personal'"
readonly
v-model="formData.semester"
name="semester"
label="学期"
/>
<van-field
v-if="name == 'grade'"
readonly
v-model="formData.schoolYear"
name="schoolYear"
label="学年"
/>
<van-field
v-if="name == 'grade'"
readonly
v-model="formData.sub"
name="sub"
label="学科"
/>
<!-- <van-popup v-model:show="showPickerSubject" position="bottom">-->
<!-- <van-picker-->
<!-- :columns="columns"-->
<!-- @confirm="onConfirmSubject"-->
<!-- @cancel="showPickerSubject = false"-->
<!-- />-->
<!-- </van-popup>-->
<van-field
v-model="formData.plannedTime"
:is-link="formData.declareState != '3' "
readonly
name="plannedTime"
label="实验时间"
@click="formData.declareState != 3 ? showCalendar = true : showCalendar = false"
:rules="[{ required: true, message: '请选择实验时间' }]"
/>
<van-calendar v-model:show="showCalendar" type="range" @confirm="onConfirmDate"/>
<!-- <van-field-->
<!-- v-if="name == 'personal' "-->
<!-- readonly-->
<!-- v-model="formData.grade"-->
<!-- name="grade"-->
<!-- label="实验时间"-->
<!-- placeholder="实验时间"-->
<!-- :rules="[{ required: true, message: '请输入实验时间' }]"-->
<!-- />-->
<van-field
v-model="formData.experimentName"
readonly
name="name"
label="实验名称"
/>
<!-- <van-popup v-model:show="showPickerName" position="bottom">-->
<!-- <van-picker-->
<!-- :columns="columnsName"-->
<!-- @confirm="onConfirmName"-->
<!-- @cancel="showPickerName = false"-->
<!-- />-->
<!-- </van-popup>-->
<van-field
v-model="formData.experimentClassify"
readonly
name="sort"
label="实验分类"
/>
<!-- <van-popup v-model:show="showPickerSort" position="bottom">-->
<!-- <van-picker-->
<!-- :columns="columnsSort"-->
<!-- @confirm="onConfirmSort"-->
<!-- @cancel="showPickerSort = false"-->
<!-- />-->
<!-- </van-popup>-->
<van-field
v-model="formData.chapterContent"
readonly
name="section"
label="章节内容"
/>
<!-- <van-popup v-model:show="showPickerSection" position="bottom">-->
<!-- <van-picker-->
<!-- :columns="columnsSection"-->
<!-- @confirm="onConfirmSection"-->
<!-- @cancel="showPickerSection = false"-->
<!-- />-->
<!-- </van-popup>-->
<!-- 单选框 name='lab'对应提交的名 :name='index'对应提交的值 -->
<van-field name="lab" label="实验室" :rules="[{ required: true, message: '请选择实验室' }]">
<template #input>
<van-checkbox-group v-model="checked" direction="horizontal" icon-size="18px">
<van-checkbox :disabled="formData.declareState == '3'" v-for="item in columnsLab" :key="item.value" :name="item.value" style="margin-bottom: 8px">
{{ item.text }}
</van-checkbox>
</van-checkbox-group>
</template>
</van-field>
</van-cell-group>
<div v-if="name == 'grade'" class="topTitle">(非必填)完善信息</div>
<van-cell-group inset style="padding: 10px">
<div style="font-size: 14px;margin: 10px">实验用品</div>
<van-field
:readonly="formData.declareState == '3'"
style="border: 1px solid silver"
name="message"
v-model="formData.experimentUseGoods"
rows="3"
autosize
type="textarea"
placeholder="实验用品"
/>
</van-cell-group>
<div style="margin: 20px;display: flex;justify-content: center">
<van-button v-if="name == 'grade'" style="margin-right: 50px;width: 90px;height: 30px" round type="primary" native-type="submit">
同意
</van-button>
<van-button v-if="name == 'personal'" style="margin-right: 50px;width: 90px;height: 30px" round type="primary" native-type="submit">
分配
</van-button>
<van-button style="width: 90px;height: 30px" round type="success" @click="goback">
取消
</van-button>
</div>
</van-form>
</template>
<script setup>
import {getLabList,getGradePlanDetail,gradeLabAllocation,getPersonalApproveDetail,personalLabApprove } from '@/service/laboratoryManagement'
import {reactive, onMounted, toRefs, ref} from "vue";
import {useStore} from "vuex";
import {useRouter, useRoute} from "vue-router";
import {formatDate} from "@/utils/time";
import {Toast} from "vant";
const store = useStore();
const router = useRouter();
const route = useRoute();
const name = route.query.name;
const title = ref('')
const formData = reactive({
sub:'',
grade: '',
semester:'',
schoolYear:'',
plannedTime:'',
experimentName:'',
experimentClassify:'',
chapterContent:'',
declareState:''
})
const selectStartTime = ref('')
const selectEndTime = ref('')
const checked = ref([])
const columnsLab = ref([])
onMounted(async ()=>{
let labResult = await getLabList()
console.log('labResult',labResult)
if(labResult.code == 200){
columnsLab.value = labResult.rows.map(item => {
return{
text:item.labName,
value:item.id
}
})
console.log('columnsLab.value',columnsLab.value)
}
if(name == 'personal'){
//个人实验审批接口
title.value = '实验室分配'
let res = await getPersonalApproveDetail(route.query.id)
console.log('res',res)
if(res.code == 200){
Object.assign(formData,res.data)
if(res.data.schoolLabClassYearRelationList!=null || undefined || ''){
checked.value = res.data.schoolLabClassYearRelationList.map(item => {
return item.labId
})
}
console.log('checked.value',checked.value)
formData.sub = formData.sub == '1' ? '物理' : formData.sub == '2' ? '化学' : '生物';
formData.semester = formData.semester == '1' ? '上学期' : '下学期';
formData.experimentClassify = formData.experimentClassify == '1' ? '分组实验': formData.experimentClassify == '2' ? '演示实验' : '探究实验';
formData.plannedTime = res.data.plannedStartTime + '-' + res.data.plannedEndTime
}
}
if(name == 'grade'){
title.value = '年级实验室分配'
//管理员年级实验分配接口
let res = await getGradePlanDetail(route.query.id)
console.log('res',res)
if(res.code == 200){
Object.assign(formData,res.data)
if(res.data.schoolLabClassYearRelationList!=null || undefined || ''){
checked.value = res.data.schoolLabClassYearRelationList.map(item => {
return item.labId
})
}
console.log('checked.value',checked.value)
formData.sub = formData.sub == '1' ? '物理' : formData.sub == '2' ? '化学' : '生物';
formData.semester = formData.semester == '1' ? '上学期' : '下学期';
formData.experimentClassify = formData.experimentClassify == '1' ? '分组实验': formData.experimentClassify == '2' ? '演示实验' : '探究实验';
formData.plannedTime = res.data.plannedStartTime + '-' + res.data.plannedEndTime
}
}
})
//日历显示隐藏
const showCalendar = ref(false);
//确认选择时间
const onConfirmDate = (values) => {
const [start, end] = values;
showCalendar.value = false;
formData.plannedTime = `${formatDate(start)} - ${formatDate(end)}`;
selectStartTime.value = `${formatDate(start)}`
selectEndTime.value = `${formatDate(end)}`
console.log('selectStartTime.value',selectStartTime.value)
};
const dateArrays = ref([])
//提交
const onSubmit = async (values) => {
console.log('checked.value',checked.value)
if(name == 'grade' && checked.value.length!=0){
console.log('submit', values);
console.log('formData', formData);
if(selectStartTime.value && selectEndTime.value){
dateArrays.value = [selectStartTime.value,selectEndTime.value]
}else{
dateArrays.value = [formData.plannedStartTime,formData.plannedEndTime]
}
checked.value = checked.value.map(item => {
return { labId : item}
})
console.log('checked.value',checked.value)
const params = {
id:route.query.id,
schoolLabClassYearRelationList:checked.value,
dateArrays:dateArrays.value,
experimentUseGoods:formData.experimentUseGoods
}
console.log('params',params)
let result = await gradeLabAllocation(params)
console.log('result',result)
if(result.code == 200){
Toast('分配成功')
router.back()
}
}
if(name == 'personal' && checked.value.length!=0){
console.log('submit123', values);
console.log('formData123', formData);
if(selectStartTime.value && selectEndTime.value){
dateArrays.value = [selectStartTime.value,selectEndTime.value]
}else{
dateArrays.value = [formData.plannedStartTime,formData.plannedEndTime]
}
checked.value = checked.value.map(item => {
return { labId : item}
})
console.log('checked.value',checked.value)
const params = {
id:route.query.id,
schoolTeacherExperimentApplyLabsList:checked.value,
dateArrays:dateArrays.value,
experimentUseGoods:formData.experimentUseGoods,
declareState:'3'
}
console.log('params123',params)
let result = await personalLabApprove(params)
console.log('result123',result)
if(result.code == 200){
Toast('分配成功')
router.back()
}
}
};
//返回上一页
const goback = () => {
router.back();
}
</script>
<style scoped>
.topTitle {
font-size: 16px;
color: #1989fa;
font-weight: bold;
margin: 20px 0px 10px 20px;
}
</style>
src/views/teacher/laboratoryManagement/manager/gradeLaboratory.vue 0 → 100644
<!-- 实验室管理员-年级实验预约列表-->
<template>
<van-nav-bar title="年级实验室预约申请列表" left-text="返回" left-arrow @click-left="goback" ></van-nav-bar>
<div>
<!--学年/学期 -->
<schoolYear @select="handleSelect"></schoolYear>
<van-pull-refresh v-model="refreshing" @refresh="onRefresh">
<!-- <form action="/">-->
<!-- <van-search-->
<!-- v-model="searchValue"-->
<!-- show-action-->
<!-- placeholder="请输入搜索关键词"-->
<!-- @search="onSearch"-->
<!-- @cancel="onCancel"-->
<!-- />-->
<!-- </form>-->
<van-list
v-model:loading="loading"
:finished="finished"
finished-text="没有更多了"
@load="onLoad"
>
<div v-for="(item,index) in list" :key="index">
<div class="card" @click="toDetail(item.id)">
<div class="topContent">
<div class="topLeft">
<van-image v-if="item.sub == '1'" style="height: 20px;width: 20px;vertical-align: middle" :src="require('../../../../assets/icon/physics.png')"></van-image>
<van-image v-if="item.sub == '3'" style="height: 20px;width: 20px;vertical-align: middle" :src="require('../../../../assets/icon/biology.png')"></van-image>
<van-image v-if="item.sub == '2'" style="height: 20px;width: 20px;vertical-align: middle" :src="require('../../../../assets/icon/chemistry.png')"></van-image>
<span style="font-size: 16px;font-weight: bold;padding-left: 5px">{{item.sub == '1' ? '物理' : item.sub == '2' ? '化学' : '生物'}}研究</span>
</div>
<div class="topRight">
<div v-if="item.declareState == '3'" class="assigned">已分配</div>
<div v-else class="unAssigned">未分配</div>
</div>
</div>
<div class="time">
<van-image style="height: 14px;width: 14px" :src="require('../../../../assets/icon/time.png')"></van-image>
<span style="font-size: 14px;padding-left: 5px;display: inline-block">{{ item.plannedStartTime }} - {{item.plannedEndTime}}</span>
</div>
<div class="bottomContent">
<div>{{ item.grade }}</div>
<div>{{item.sub == '1' ? '物理' : item.sub == '2' ? '化学' : '生物'}} </div>
<div>{{ item.schoolYear }}{{item.semester == '1' ? '上学期' : '下学期'}}</div>
</div>
</div>
</div>
</van-list>
</van-pull-refresh>
</div>
</template>
<script setup>
import {getGradeAllocationList } from '@/service/laboratoryManagement'
import { reactive, onMounted, toRefs, ref } from "vue";
import { useStore } from "vuex";
import { useRouter, useRoute } from "vue-router";
import { formatDate } from "@/utils/time";
import {Toast} from "vant";
const store = useStore();
const router = useRouter()
//选中学年的参数
const handleSelect = (value) => {
console.log('handleSelect', value)
year.value = value[0];
semester.value = value[1];
onLoad()
}
//列表数据
const list = ref([]);
//loading 和 finished 两个变量控制加载状态
//当组件滚动到底部时，会触发 load 事件并将 loading 设置成 true。
//此时可以发起异步操作并更新数据，数据更新完毕后，将 loading 设置成 false 即可。
// 若数据已全部加载完毕，则直接将 finished 设置成 true 即可。
const loading = ref(false);
const finished = ref(false);
const refreshing = ref(false);
const semester = ref('');
const year = ref('');
const searchValue = ref('');
//列表加载事件
const onLoad = async () => {
if (refreshing.value) {
list.value = [];
refreshing.value = false;
}
console.log('semester.value',semester.value)
if(semester.value == '上学期' ||semester.value == '1' ){
semester.value = '1'
}else{
semester.value = '2'
}
const params = {
schoolYear: year.value,
semester: semester.value
}
console.log('params', params)
//接口
let result = await getGradeAllocationList(params)
console.log('result',result)
if(result.code == 200){
loading.value = false;
list.value = result.data
finished.value = true
}else{
Toast("获取信息失败!");
finished.value = true;
loading.value = false;
return;
}
}
//点击事件
const toDetail = (id) =>{
router.push({
path:'/laboratoryManagement/gradeLaboratory/checkGradeComplete',
query:{
id:id,
name:'grade'
}
})
}
//下拉刷新
const onRefresh = () => {
//// 清空列表数据
finished.value = false;
// 重新加载数据
// 将 loading 设置为 true，表示处于加载状态
loading.value = true;
onLoad()
};
//搜索
const onSearch = (val) => {
onLoad()
};
//取消
const onCancel = () => {
onLoad()
};
//返回上一页
const goback = () => {
router.back();
}
</script>
<style scoped>
.card{
background: #FFFFFF;
margin: 10px;
border-radius: 20px;
}
.topContent{
display: flex;
flex-direction: row;
justify-content: space-between;
padding-top: 15px;
padding-bottom: 10px;
}
.topLeft{
margin-left: 20px;
display: flex;
align-items: center;
justify-content: center;
}
.topRight{
margin-top: -5px;
text-align: center;
width: 60px;
height: 20px;
line-height: 25px;
color: #FFFFFF;
font-size: 14px;
margin-right: 10px;
}
.assigned{
background:#00c15d ;
border-radius: 10px;
}
.unAssigned{
background:#4ea0fc ;
border-radius: 10px;
}
.time{
margin-left: 20px;
margin-right: 20px;
height: 20px;
line-height: 20px;
border-bottom:1px solid #aebdc5 ;
padding-bottom: 10px;
}
.bottomContent{
font-size: 14px;
margin-top: 10px;
padding-bottom: 10px;
display: flex;
flex-direction: row;
justify-content: space-around;
color: #6f787d;
}
.experimentType{
justify-content: center;
align-items: center;
font-size: 14px;
display: flex;
flex-direction: column;
}
</style>
src/views/teacher/laboratoryManagement/manager/personalLaboratoryApprove.vue 0 → 100644
<!--实验室管理员-个人实验审批-->
<template>
<van-nav-bar title="审批教师演示实验" left-text="返回" left-arrow @click-left="goback"></van-nav-bar>
<div>
<!-- 搜索框 -->
<form action="/">
<van-search
v-model="searchValue"
show-action
placeholder="请输入搜索关键词"
@search="onSearch"
@cancel="onCancel"
/>
</form>
<!--学年/学期 -->
<schoolYear @select="handleSelect"></schoolYear>
<van-pull-refresh v-model="refreshing" @refresh="onRefresh">
<van-list
v-model:loading="loading"
:finished="finished"
finished-text="没有更多了"
@load="onLoad"
>
<div v-for="(item,index) in list" :key="index">
<div class="card" @click="toDetail(item.id)">
<div class="topContent">
<div class="topLeft">
<van-image v-if="item.sub == '1'" style="height: 20px;width: 20px;vertical-align: middle"
:src="require('../../../../assets/icon/physics.png')"></van-image>
<van-image v-if="item.sub == '3'" style="height: 20px;width: 20px;vertical-align: middle"
:src="require('../../../../assets/icon/biology.png')"></van-image>
<van-image v-if="item.sub == '2'" style="height: 20px;width: 20px;vertical-align: middle"
:src="require('../../../../assets/icon/chemistry.png')"></van-image>
<span
style="font-size: 16px;font-weight: bold;padding-left: 5px">{{ item.sub == '1' ? '物理' : item.sub == '2' ? '化学' : '生物' }}研究</span>
</div>
<div class="topRight">
<div v-if="item.declareState == '3'" class="assigned">已分配</div>
<div v-else class="unAssigned">未分配</div>
</div>
</div>
<div class="middleContent">
<div style="margin-right: 50px">
<span>级部：</span>
<span>{{ item.grade }}</span>
</div>
<div>
<span>学期：</span>
<span>{{ item.schoolYear }}{{item.semester == '1' ? '上学期':'下学期'}}</span>
</div>
</div>
<div class="bottomContent">
<div style="margin-right: 70px">
<span>教师：</span>
<span>{{ item.applyName }}</span>
</div>
<div>
<span>实验室：</span>
<span>{{ item.labName }}</span>
</div>
</div>
</div>
</div>
</van-list>
</van-pull-refresh>
</div>
</template>
<script setup>
import {getPersonalApproveList} from '@/service/laboratoryManagement'
import {reactive, onMounted, toRefs, ref} from "vue";
import {useStore} from "vuex";
import {useRouter, useRoute} from "vue-router";
import {formatDate} from "@/utils/time";
import {Toast} from "vant";
const store = useStore();
const router = useRouter();
const semester = ref('');
const year = ref('');
//选中学年的参数
const handleSelect = (value) => {
console.log('handleSelect', value)
year.value = value[0];
semester.value = value[1];
onLoad()
}
//列表数据
const list = ref([]);
//loading 和 finished 两个变量控制加载状态
//当组件滚动到底部时，会触发 load 事件并将 loading 设置成 true。
//此时可以发起异步操作并更新数据，数据更新完毕后，将 loading 设置成 false 即可。
// 若数据已全部加载完毕，则直接将 finished 设置成 true 即可。
const loading = ref(false);
const finished = ref(false);
const refreshing = ref(false);
const searchValue = ref('');
//列表加载事件
const onLoad = async () => {
if (refreshing.value) {
list.value = [];
refreshing.value = false;
}
console.log('semester.value', semester.value)
if (semester.value == '上学期' || semester.value == '1') {
semester.value = '1'
} else {
semester.value = '2'
}
const params = {
schoolYear: year.value,
semester: semester.value,
querText: searchValue.value
}
console.log('params', params)
//接口
let result = await getPersonalApproveList(params)
console.log('result', result)
if (result.code == 200) {
loading.value = false;
list.value = result.data
finished.value = true
} else {
Toast("获取信息失败!");
finished.value = true;
loading.value = false;
return;
}
}
//点击事件
const toDetail = (id) => {
router.push({
path: '/laboratoryManagement/gradeLaboratory/checkGradeComplete',
query: {
id: id,
name: 'personal'
}
})
}
//下拉刷新
const onRefresh = () => {
//// 清空列表数据
finished.value = false;
// 重新加载数据
// 将 loading 设置为 true，表示处于加载状态
loading.value = true;
onLoad()
};
//搜索
const onSearch = (val) => {
};
//取消
const onCancel = () => {
onLoad()
};
//返回上一页
const goback = () => {
router.back();
}
</script>
<style scoped>
.card {
background: #FFFFFF;
margin: 10px;
border-radius: 20px;
}
.topContent {
display: flex;
flex-direction: row;
justify-content: space-between;
padding-top: 15px;
padding-bottom: 10px;
}
.topLeft {
margin-left: 20px;
display: flex;
align-items: center;
justify-content: center;
}
.topRight {
margin-top: -5px;
text-align: center;
width: 60px;
height: 20px;
line-height: 25px;
color: #FFFFFF;
font-size: 14px;
margin-right: 10px;
}
.assigned {
background: #00c15d;
border-radius: 10px;
}
.unAssigned {
background: #4ea0fc;
border-radius: 10px;
}
.time {
margin-left: 20px;
margin-right: 20px;
height: 20px;
line-height: 20px;
border-bottom: 1px solid #aebdc5;
padding-bottom: 10px;
}
.bottomContent, .middleContent {
font-size: 14px;
margin: 10px 20px;
padding-bottom: 10px;
display: flex;
flex-direction: row;
/*justify-content: space-between;*/
color: #6f787d;
}
.middleContent {
border-bottom: 1px solid silver;
}
.experimentType {
justify-content: center;
align-items: center;
font-size: 14px;
display: flex;
flex-direction: column;
}
</style>
src/views/teacher/laboratoryManagement/manager/teacherLaboratory.vue 0 → 100644
<!--实验室管理员-教师实验室预约-->
<template>
<van-nav-bar title="教师实验室预约列表" left-text="返回" left-arrow @click-left="goback"></van-nav-bar>
<div>
<!--学年/学期 -->
<schoolYear @select="handleSelect"></schoolYear>
<van-pull-refresh v-model="refreshing" @refresh="onRefresh">
<!-- <form action="/">-->
<!-- <van-search-->
<!-- v-model="searchValue"-->
<!-- show-action-->
<!-- placeholder="请输入搜索关键词"-->
<!-- @search="onSearch"-->
<!-- @cancel="onCancel"-->
<!-- />-->
<!-- </form>-->
<van-list
v-model:loading="loading"
:finished="finished"
finished-text="没有更多了"
@load="onLoad"
>
<div v-for="(item,index) in list" :key="index">
<div class="card" @click="toDetail(item.id,item.applyState)">
<div class="topContent">
<div class="topLeft">
<van-image v-if="item.sub == '1'" style="height: 20px;width: 20px;vertical-align: middle"
:src="require('../../../../assets/icon/physics.png')"></van-image>
<van-image v-if="item.sub == '3'" style="height: 20px;width: 20px;vertical-align: middle"
:src="require('../../../../assets/icon/biology.png')"></van-image>
<van-image v-if="item.sub == '2'" style="height: 20px;width: 20px;vertical-align: middle"
:src="require('../../../../assets/icon/chemistry.png')"></van-image>
<span
style="font-size: 16px;font-weight: bold;padding-left: 5px">{{ item.sub == '1' ? '物理' : item.sub == '2' ? '化学' : '生物' }}研究</span>
</div>
<div class="topRight">
<div v-if="item.applyState == '1'" class="assigned">已审批</div>
<div v-if="item.applyState == '0'" class="unAssigned">待审批</div>
</div>
</div>
<div class="time">
<van-image style="height: 14px;width: 14px"
:src="require('../../../../assets/icon/time.png')"></van-image>
<span style="font-size: 14px;padding-left: 5px;display: inline-block">{{ item.experimentTime }}</span>
<span style="font-size: 14px;margin-left: 50px">{{ item.section }}</span>
</div>
<div class="middleContent">
<div style="height: 20px">
<van-image style="height: 14px;width: 14px;vertical-align: middle"
:src="require('../../../../assets/icon/book.png')"></van-image>
<span style="font-size: 14px;padding-left: 5px;display: inline-block">{{ item.sub == '1' ? '物理' : item.sub == '2' ? '化学' : '生物' }}</span>
</div>
<div style="height: 20px">
<van-image style="height: 14px;width: 14px;vertical-align: middle"
:src="require('../../../../assets/icon/grade.png')"></van-image>
<span style="font-size: 14px;padding-left: 5px;display: inline-block">{{ item.grade }}</span>
</div>
<div style="height: 20px">
<van-image style="height: 14px;width: 14px;vertical-align: middle"
:src="require('../../../../assets/icon/calendar.png')"></van-image>
<span style="font-size: 14px;padding-left: 5px;display: inline-block">{{ item.schoolYear }}{{item.semester == '1' ? '上学期' : '下学期'}}</span>
</div>
</div>
<div class="bottomContent">
<div>
<van-image style="height: 14px;width: 14px;vertical-align: middle"
:src="require('../../../../assets/icon/person.png')"></van-image>
<span style="font-size: 14px;padding-left: 5px;display: inline-block">{{ item.className }}</span>
</div>
<div>
<van-image style="height: 20px;width: 20px;vertical-align: middle"
:src="require('../../../../assets/icon/group.png')"></van-image>
<span style="font-size: 14px;padding-left: 3px;display: inline-block">{{ item.experimentClassify == '1' ? '分组实验' : item.experimentClassify == '2' ? '演示实验' : '探究实验' }}</span>
</div>
<div>
<van-image style="height: 17px;width: 17px;vertical-align: middle"
:src="require('../../../../assets/icon/people.png')"></van-image>
<span style="font-size: 14px;padding-left: 5px;display: inline-block">{{ item.applyName }}</span>
</div>
<div>
<van-image style="height: 15px;width: 15px;vertical-align: middle"
:src="require('../../../../assets/icon/room.png')"></van-image>
<span style="font-size: 14px;padding-left: 5px;display: inline-block">{{ item.labName }}</span>
</div>
<s></s>
</div>
</div>
</div>
</van-list>
</van-pull-refresh>
</div>
</template>
<script setup>
import {getTeacherOrderList} from '@/service/laboratoryManagement'
import {reactive, onMounted, toRefs, ref} from "vue";
import {useStore} from "vuex";
import {useRouter, useRoute} from "vue-router";
import {formatDate} from "@/utils/time";
import {Toast} from "vant";
const store = useStore();
const router = useRouter();
const semester = ref('');
const year = ref('');
//选中学年的参数
const handleSelect = (value) => {
console.log('handleSelect', value)
year.value = value[0];
semester.value = value[1];
onLoad()
}
//列表数据
const list = ref([]);
//loading 和 finished 两个变量控制加载状态
//当组件滚动到底部时，会触发 load 事件并将 loading 设置成 true。
//此时可以发起异步操作并更新数据，数据更新完毕后，将 loading 设置成 false 即可。
// 若数据已全部加载完毕，则直接将 finished 设置成 true 即可。
const loading = ref(false);
const finished = ref(false);
const refreshing = ref(false);
const searchValue = ref('');
//列表加载事件
const onLoad = async () => {
if (refreshing.value) {
list.value = [];
refreshing.value = false;
}
console.log('semester.value', semester.value)
if (semester.value == '上学期' || semester.value == '1') {
semester.value = '1'
} else {
semester.value = '2'
}
const params = {
schoolYear: year.value,
semester: semester.value
}
console.log('params', params)
//接口
let result = await getTeacherOrderList(params)
console.log('result', result)
if (result.code == 200) {
loading.value = false;
list.value = result.data
finished.value = true
} else {
Toast("获取信息失败!");
finished.value = true;
loading.value = false;
return;
}
}
//点击事件
const toDetail = (id, applyState) => {
//已审批-查看审批
router.push({
path: '/laboratoryManagement/teacherLaboratory/teacherLaboratoryApprove',
query: {
id: id,
applyState: applyState
}
})
// 待审批-审批申请
// router.push({
// path: '/laboratoryManagement/teacherLaboratory/applyTeacherApprove',
// query:{
// id:id
// }
// })
}
//下拉刷新
const onRefresh = () => {
//// 清空列表数据
finished.value = false;
// 重新加载数据
// 将 loading 设置为 true，表示处于加载状态
loading.value = true;
onLoad()
};
//搜索
const onSearch = (val) => {
onLoad()
};
//取消
const onCancel = () => {
onLoad()
};
//返回上一页
const goback = () => {
router.back();
}
</script>
<style scoped>
.card {
background: #FFFFFF;
margin: 10px;
border-radius: 20px;
}
.topContent {
display: flex;
flex-direction: row;
justify-content: space-between;
padding-top: 15px;
padding-bottom: 10px;
}
.topLeft {
margin-left: 20px;
display: flex;
align-items: center;
justify-content: center;
}
.topRight {
margin-top: -5px;
text-align: center;
width: 60px;
height: 20px;
line-height: 25px;
color: #FFFFFF;
font-size: 14px;
margin-right: 10px;
}
.assigned {
background: #00c15d;
border-radius: 10px;
}
.unAssigned {
background: #4ea0fc;
border-radius: 10px;
}
.time {
margin-left: 20px;
margin-right: 20px;
height: 20px;
line-height: 20px;
border-bottom: 1px solid #aebdc5;
padding-bottom: 10px;
}
.middleContent {
margin-left: 20px;
margin-right: 20px;
display: flex;
justify-content: space-between;
border-bottom: 1px solid #aebdc5;
height: 40px;
line-height: 40px;
}
.bottomContent {
margin-left: 20px;
margin-right: 20px;
font-size: 14px;
margin-top: 10px;
padding-bottom: 20px;
display: flex;
flex-direction: row;
justify-content: space-between;
color: #6f787d;
}
.experimentType {
justify-content: center;
align-items: center;
font-size: 14px;
display: flex;
flex-direction: column;
}
</style>
src/views/teacher/laboratoryManagement/manager/teacherLaboratoryApprove.vue 0 → 100644
<!--实验室管理员-教师实验室预约-教师实验室记录查看-->
<template>
<van-nav-bar title="教师实验室记录查看" left-text="返回" left-arrow @click-left="goback" ></van-nav-bar>
<div class="topTitle">实验信息
</div>
<van-form>
<van-cell-group inset>
<van-field
v-model="form.sub"
readonly
label="学科"
/>
<van-field
readonly
v-model="form.grade"
label="级部"
/>
<van-field
readonly
v-model="form.semester"
label="学期"
/>
<van-field
readonly
v-model="form.className"
label="班级"
/>
<van-field
readonly
v-model="form.section"
label="节次"
/>
<van-field
readonly
v-model="form.experimentName"
label="实验名称"
/>
<van-field
readonly
v-model="form.experimentClassify"
label="实验分类"
/>
<van-field
readonly
v-model="form.labName"
label="实验室"
/>
<van-field
readonly
v-model="form.chapterContent"
label="章节内容"
/>
<van-field
readonly
v-model="form.experimentTime"
label="实验时间"
/>
<div style="margin: 10px">
<div style="font-size: 16px;margin: 8px;font-size: 14px;color: #646566">实验用品</div>
<van-field
readonly
style="border: 1px solid #ebedf0;border-radius: 10px"
name="message"
v-model="form.experimentUseGoods"
rows="3"
autosize
type="textarea"
/>
</div>
</van-cell-group>
<div v-if="applyState == '1'" style="margin: 16px;">
<van-button round block type="primary" @click="goback">
关闭
</van-button>
</div>
<div v-else style="margin: 20px;display: flex;justify-content: center">
<van-button @click="submit" style="margin-right: 50px;width: 90px;height: 30px" round type="primary" native-type="submit">
同意
</van-button>
<van-button style="width: 90px;height: 30px" round type="success" @click="goback">
取消
</van-button>
</div>
</van-form>
</template>
<script setup>
import {getTeacherOrderDetail,labDetailApprove} from '@/service/laboratoryManagement'
import { reactive, onMounted, toRefs, ref } from "vue";
import { useStore } from "vuex";
import { useRouter, useRoute } from "vue-router";
import { formatDate } from "@/utils/time";
import {Toast} from "vant";
const store = useStore();
const router = useRouter();
const route = useRoute();
const applyState = route.query.applyState;
const form = reactive({
sub:'',
grade:'',
semester:'',
className:'',
section:'',
experimentName:'',
experimentClassify:'',
labName:'',
chapterContent:'',
experimentTime:'',
experimentUseGoods:''
})
onMounted(async () => {
let res = await getTeacherOrderDetail(route.query.id)
console.log('res',res)
if(res.code == 200){
Object.assign(form,res.data)
form.sub = form.sub == '1' ? '物理' : form.sub == '2' ? '化学' : '生物';
form.semester = form.semester == '1' ? '上学期' : '下学期';
form.experimentClassify = form.experimentClassify == '1' ? '分组实验': form.experimentClassify == '2' ? '演示实验' : '探究实验';
}
})
const submit = async () => {
const params = {
id:route.query.id
}
let res = await labDetailApprove(params)
console.log('res',res)
if(res.code == 200){
Toast('审批成功');
router.back()
}
}
//返回上一页
const goback = () => {
router.back();
}
</script>
<style scoped>
</style>
src/views/teacher/laboratoryManagement/teacher/PersonalLaboratoryApplication.vue 0 → 100644
<!--教师申请-个人实验申请-->
<template>
<van-nav-bar title="教师演示实验申请" left-text="返回" left-arrow @click-left="goback"></van-nav-bar>
<div>
<!-- 搜索框 -->
<form action="/">
<van-search
v-model="searchValue"
show-action
placeholder="搜索学年、级部、实验名称"
@search="onSearch"
@cancel="onCancel"
/>
</form>
<div style="display:flex;justify-content: space-between">
<!--学年/学期 -->
<schoolYear @select="handleSelect"></schoolYear>
<!--新增按钮 -->
<div style="margin-right: 20px;">
<van-button size="mini" round type="primary" @click="addDetail">新增申请</van-button>
</div>
</div>
<van-pull-refresh v-model="refreshing" @refresh="onRefresh">
<van-list
v-model:loading="loading"
:finished="finished"
finished-text="没有更多了"
@load="onLoad"
>
<div v-for="(item,index) in list" :key="index">
<div class="card" @click="toDetail(item.id)">
<div class="topContent">
<div class="topLeft">
<van-image v-if="item.sub == '1'" style="height: 20px;width: 20px;vertical-align: middle"
:src="require('../../../../assets/icon/physics.png')"></van-image>
<van-image v-if="item.sub == '3'" style="height: 20px;width: 20px;vertical-align: middle"
:src="require('../../../../assets/icon/biology.png')"></van-image>
<van-image v-if="item.sub == '2'" style="height: 20px;width: 20px;vertical-align: middle"
:src="require('../../../../assets/icon/chemistry.png')"></van-image>
<span
style="font-size: 16px;font-weight: bold;padding-left: 5px">{{ item.sub == '1' ? '物理' : item.sub == '2' ? '化学' : '生物' }}研究</span>
</div>
<div class="topRight">
<div v-if="item.declareState == '3'" class="unAssigned">已分配</div>
<div v-else class="assigned">未分配</div>
</div>
</div>
<div class="middleContent">
<div style="width: 60%">
<span>级部：</span>
<span>{{ item.grade }}</span>
</div>
<div style="width: 40%;">
<span>学期：</span>
<span>{{ item.schoolYear }}{{item.semester == '1' ? '上学期':'下学期'}}</span>
</div>
</div>
<div class="bottomContent" style="padding-bottom: 20px">
<div style="width: 60%">
<span>教师：</span>
<span>{{ item.applyName }}</span>
</div>
<div style="width: 40%;overflow: hidden; white-space: nowrap; text-overflow: ellipsis">
<span>实验室：</span>
<span>{{ item.labName }}</span>
</div>
</div>
<div class="bottomButton" v-if="item.declareState != '3'">
<van-button color="#e5c35d" size="small" class="edit" @click="toEdit(item.id)">修改</van-button>
<van-button type="danger" size="small" class="delete" @click="handleDelete(item.id)">删除</van-button>
</div>
</div>
</div>
</van-list>
</van-pull-refresh>
</div>
</template>
<script setup>
import {getPersonalLabApplyList,deleteApply} from '@/service/laboratoryManagement'
import {reactive, onMounted, toRefs, ref} from "vue";
import {useStore} from "vuex";
import {useRouter, useRoute} from "vue-router";
import {formatDate} from "@/utils/time";
import {Toast} from "vant";
const store = useStore();
const router = useRouter();
const semester = ref('');
const year = ref('');
//选中学年的参数
const handleSelect = (value) => {
console.log('handleSelect', value)
year.value = value[0];
semester.value = value[1];
onLoad()
}
//列表数据
const list = ref([]);
//loading 和 finished 两个变量控制加载状态
//当组件滚动到底部时，会触发 load 事件并将 loading 设置成 true。
//此时可以发起异步操作并更新数据，数据更新完毕后，将 loading 设置成 false 即可。
// 若数据已全部加载完毕，则直接将 finished 设置成 true 即可。
const loading = ref(false);
const finished = ref(false);
const refreshing = ref(false);
const searchValue = ref('');
//列表加载事件
const onLoad = async () => {
if (refreshing.value) {
list.value = [];
refreshing.value = false;
}
console.log('semester.value', semester.value)
if (semester.value == '上学期' || semester.value == '1') {
semester.value = '1'
} else {
semester.value = '2'
}
const params = {
schoolYear: year.value,
semester: semester.value,
querText: searchValue.value,
}
console.log('params', params)
//接口
let result = await getPersonalLabApplyList(params)
console.log('result', result)
if (result.code == 200) {
loading.value = false;
list.value = result.data
finished.value = true
} else {
Toast("获取信息失败!");
finished.value = true;
loading.value = false;
return;
}
}
//新增按钮
const addDetail = () => {
router.push({
path: '/laboratoryManagement/PersonalLaboratoryApplication/PersonalLaboratoryApplyDetail',
query: {
name: '新增'
}
})
}
//card点击事件
const toDetail = (id) => {
router.push({
path: '/laboratoryManagement/PersonalLaboratoryApplication/PersonalLaboratoryApplyDetail',
query: {
id: id,
name: '查看'
}
})
}
//修改按钮
const toEdit = (id) => {
router.push({
path: '/laboratoryManagement/PersonalLaboratoryApplication/PersonalLaboratoryApplyDetail',
query: {
id: id,
name: '修改'
}
})
}
//删除按钮
const handleDelete = async (id) => {
let result = await deleteApply(id)
console.log('result',result)
}
//下拉刷新
const onRefresh = () => {
//// 清空列表数据
finished.value = false;
// 重新加载数据
// 将 loading 设置为 true，表示处于加载状态
loading.value = true;
onLoad()
};
//搜索
const onSearch = (val) => {
onLoad()
};
//取消
const onCancel = () => {
onLoad()
};
//返回上一页
const goback = () => {
router.back();
}
</script>
<style scoped>
.card {
background: #FFFFFF;
margin: 10px;
border-radius: 20px;
}
.topContent {
display: flex;
flex-direction: row;
justify-content: space-between;
padding-top: 15px;
padding-bottom: 10px;
}
.topLeft {
margin-left: 20px;
display: flex;
align-items: center;
justify-content: center;
}
.topRight {
margin-top: -5px;
text-align: center;
width: 60px;
height: 20px;
line-height: 25px;
color: #FFFFFF;
font-size: 14px;
margin-right: 10px;
}
.assigned {
background: #00c15d;
border-radius: 10px;
}
.unAssigned {
background: #4ea0fc;
border-radius: 10px;
}
.time {
margin-left: 20px;
margin-right: 20px;
height: 20px;
line-height: 20px;
border-bottom: 1px solid #aebdc5;
padding-bottom: 10px;
}
.bottomContent, .middleContent {
font-size: 14px;
margin: 10px 20px;
padding-bottom: 10px;
display: flex;
flex-direction: row;
/*justify-content: space-between;*/
color: #6f787d;
}
.middleContent {
border-bottom: 1px solid silver;
}
.experimentType {
justify-content: center;
align-items: center;
font-size: 14px;
display: flex;
flex-direction: column;
}
.schoolYearNew {
font-size: 12px;
width: 165px;
height: 30px;
margin-top: 5px;
margin-left: 20px;
border: 1px solid silver;
border-radius: 5px;
}
.van-cell.van-field.schoolYearNew {
padding: 0px !important;
height: 30px;
line-height: 30px;
}
.bottomButton {
display: flex;
justify-content: right;
}
.edit, .delete {
border-radius: 10px;
width: 55px;
height: 30px;
line-height: 25px;
margin-right: 10px;
margin-bottom: 10px;
}
</style>
src/views/teacher/laboratoryManagement/teacher/PersonalLaboratoryApplyDetail.vue 0 → 100644
<template>
<van-nav-bar :title="title" left-text="返回" left-arrow @click-left="goback" ></van-nav-bar>
<div class="topTitle">实验信息
</div>
<van-form>
<van-cell-group inset>
<van-field
v-model="formData.sub"
:readonly="name == '查看' ? true : false"
label="学科"
/>
<van-field
:readonly="name == '查看' ? true : false"
v-model="formData.grade"
label="级部"
/>
<van-field
:readonly="name == '查看' ? true : false"
v-model="formData.semester"
label="学期"
/>
<van-field
v-if="name == '查看'"
readonly
v-model="formData.experimentTime"
label="实验时间"
/>
<van-field
:readonly="name == '查看' ? true : false"
v-model="formData.experimentName"
label="实验名称"
/>
<van-field
v-model="value"
is-link
readonly
name="calendar"
label="实验时间"
placeholder="点击选择实验时间"
@click="showCalendar = true"
/>
<van-calendar v-model:show="showCalendar" type="range" @confirm="onConfirm" />
<div v-if="name == '新增' ||name =='修改'">
<van-field
is-link
readonly
v-model="formData.experimentClassify"
label="实验分类"
@click="showPickerClassify = true"
/>
<van-popup v-model:show="showPickerClassify" position="bottom">
<van-picker
:columns="columnsClassify"
@confirm="onConfirmClassify"
@cancel="showPickerClassify = false"
/>
</van-popup>
</div>
<van-field
v-if="name == '查看'"
readonly
v-model="formData.experimentClassify"
label="实验分类"
/>
<van-field
:readonly="name == '查看' ? true : false"
v-model="formData.chapterContent"
label="章节内容"
/>
<div v-if="name == '新增' ||name =='修改'">
<van-field
v-model="formData.labName"
is-link
readonly
name="picker"
label="实验室"
placeholder="选择实验室"
@click="showPickerLab = true"
/>
<van-popup v-model:show="showPickerLab" position="bottom">
<van-picker
:columns="columnsLab"
@confirm="onConfirmLab"
@cancel="showPickerLab = false"
/>
</van-popup>
</div>
<van-field
v-if="name == '查看'"
readonly
v-model="formData.labName"
label="实验室"
/>
<div v-if="name == '新增' ||name =='修改'">
<van-field
v-model="formData.section"
label="节次"
readonly
is-link
placeholder="选择节次"
@click="showPickerSection = true"
/>
<van-popup v-model:show="showPickerSection" position="bottom">
<van-picker
:columns="columnsSection"
@confirm="onConfirmSection"
@cancel="showPickerSection = false"
/>
</van-popup>
</div>
<van-field
v-if="name == '查看'"
readonly
v-model="formData.section"
label="节次"
/>
<div v-if="name == '新增' ||name =='修改'">
<van-field
v-model="formData.className"
label="班级"
is-link
readonly
placeholder="选择班级"
@click="showPickerClass = true"
/>
<van-popup v-model:show="showPickerClass" position="bottom">
<van-picker
:columns="columnsClass"
@confirm="onConfirmClass"
@cancel="showPickerClass = false"
/>
</van-popup>
</div>
<div>
<van-field
v-if="name == '查看'"
readonly
v-model="formData.className"
label="班级"
/>
</div>
<div style="margin: 10px">
<div style="font-size: 16px;margin: 8px;font-size: 14px;color: #646566">实验用品</div>
<van-field
:readonly="name == '查看' ? true : false"
style="border: 1px solid #ebedf0;border-radius: 10px"
name="message"
v-model="formData.experimentUseGoods"
rows="3"
autosize
type="textarea"
/>
</div>
</van-cell-group>
<div v-if="name == '查看'" style="margin: 16px;">
<van-button round block type="primary" @click="goback">
关闭
</van-button>
</div>
<div v-else style="margin: 20px;display: flex;justify-content: center">
<van-button style="margin-right: 50px;width: 90px;height: 30px" round type="primary" native-type="submit">
同意
</van-button>
<van-button style="width: 90px;height: 30px" round type="success" @click="goback">
取消
</van-button>
</div>
</van-form>
</template>
<script setup>
import { getPersonalApplyDetail, addPersonalApply,editApply, getLabList,getDicts } from '@/service/laboratoryManagement'
import { reactive, onMounted, toRefs, ref } from "vue";
import { useStore } from "vuex";
import { useRouter, useRoute } from "vue-router";
import { formatDate } from "@/utils/time";
import {Toast} from "vant";
const store = useStore();
const router = useRouter();
const route = useRoute();
const title = ref('')
const name = route.query.name
const formData = reactive({
sub:'',
grade:'',
semester:'',
experimentTime:'',
experimentName:'',
experimentClassify:'',
chapterContent:'',
laboratory:'',
labName:'',
section:'',
className:'',
message:''
})
onMounted(async () => {
if(route.query.id){
let detailResult = await getPersonalApplyDetail(route.query.id)
console.log('detailResult',detailResult)
if(detailResult.code == 200){
Object.assign(formData,detailResult.data)
formData.sub = formData.sub == '1' ? '物理' : formData.sub == '2' ? '化学' : '生物';
formData.semester = formData.semester == '1' ? '上学期' : '下学期';
formData.experimentClassify = formData.experimentClassify == '1' ? '分组实验': formData.experimentClassify == '2' ? '演示实验' : '探究实验';
}
if(name == '修改'){
title.value = '修改教师演示实验室申请'
}
if(name == '查看'){
title.value = '教师演示实验室申请明细'
}
}else{
title.value = '新增教师演示实验室申请'
//实验室下拉框
let labResult = await getLabList()
console.log('labResult',labResult)
if(labResult.code == 200){
columnsLab.value = labResult.rows.map(item => {
return{
text:item.labName,
value:item.id
}
})
console.log('columnsLab.value',columnsLab.value)
};
//节次下拉框
let sectionResult = await getDicts('course_arrange')
console.log('sectionResult',sectionResult)
//实验类型下拉框
let classifyResult = await getDicts('experiment_classify')
console.log('classifyResult',classifyResult)
}
})
//实验时间选择
const showCalendar = ref(false)
//实验分类下拉框
const showPickerClassify = ref(false);
const columnsClassify = ['杭州', '宁波', '温州', '嘉兴', '湖州'];
const onConfirmClassify = (value) => {
console.log('value',value)
formData.classify = value;
showPickerClassify.value = false;
};
//实验室分类下拉框
const experimentNameId= ref('')
const showPickerLab = ref(false);
// const columnsLab = ['杭州', '宁波', '温州', '嘉兴', '湖州'];
const onConfirmLab = (value) => {
formData.labName = value.text;
experimentNameId.value = value.value;
showPickerLab.value = false;
};
//节次分类下拉框
const showPickerSection = ref(false);
const columnsSection = ['杭州', '宁波', '温州', '嘉兴', '湖州'];
const onConfirmSection = (value) => {
formData.section = value;
showPickerSection.value = false;
};
//班级分类下拉框
const showPickerClass = ref(false);
const columnsClass = ['杭州', '宁波', '温州', '嘉兴', '湖州'];
const onConfirmClass = (value) => {
formData.class = value;
showPickerClass.value = false;
};
const checkForm = reactive({
})
//返回上一页
const goback = () => {
router.back();
}
</script>
<style scoped>
</style>
src/views/teacher/laboratoryManagement/teacher/checkLaboratoryApplication.vue 0 → 100644
<template>
<van-nav-bar title="教师实验室申请记录明细" left-text="返回" left-arrow @click-left="goback" ></van-nav-bar>
<div class="topTitle">实验信息
</div>
<van-form>
<van-cell-group inset>
<van-field
v-model="formData.sub"
readonly
label="学科"
/>
<van-field
readonly
v-model="formData.grade"
label="级部"
/>
<van-field
readonly
v-model="formData.semester"
label="学期"
/>
<van-field
readonly
v-model="formData.className"
label="班级"
/>
<van-field
readonly
v-model="formData.experimentTime"
label="实验时间"
/>
<van-field
readonly
v-model="formData.section"
label="节次"
/>
<van-field
readonly
v-model="formData.experimentName"
label="实验名称"
/>
<van-field
readonly
v-model="formData.experimentClassify"
label="实验分类"
/>
<van-field
readonly
v-model="formData.labName"
label="实验室"
/>
<van-field
readonly
v-model="formData.chapterContent"
label="章节内容"
/>
<div style="margin: 10px">
<div style="font-size: 16px;margin: 8px;font-size: 14px;color: #646566">实验用品</div>
<van-field
readonly
style="border: 1px solid #ebedf0;border-radius: 10px"
name="message"
v-model="formData.experimentUseGoods"
rows="3"
autosize
type="textarea"
/>
</div>
</van-cell-group>
<div style="margin: 16px;">
<van-button size="small" round block type="primary" @click="goback">
关闭
</van-button>
</div>
</van-form>
</template>
<script setup>
import {getLabApplyDetail } from '@/service/laboratoryManagement'
import { reactive, onMounted, toRefs, ref } from "vue";
import { useStore } from "vuex";
import { useRouter, useRoute } from "vue-router";
import { formatDate } from "@/utils/time";
import {Toast} from "vant";
const store = useStore();
const router = useRouter();
const route = useRoute();
const title = ref('')
const name = route.query.name
const formData = reactive({
sub:'',
grade:'',
semester:'',
className:'',
experimentTime:'',
section:'',
experimentName:'',
experimentClassify:'',
labName:'',
chapterContent:'',
experimentUseGoods:''
})
onMounted(async () => {
let result = await getLabApplyDetail(route.query.id)
console.log('result',result)
if(result.code == 200){
Object.assign(formData,result.data)
form.sub = form.sub == '1' ? '物理' : form.sub == '2' ? '化学' : '生物';
form.semester = form.semester == '1' ? '上学期' : '下学期';
form.experimentClassify = form.experimentClassify == '1' ? '分组实验': form.experimentClassify == '2' ? '演示实验' : '探究实验';
}else{
Toast("获取信息失败!");
}
})
//返回上一页
const goback = () => {
router.back();
}
</script>
<style scoped>
</style>
src/views/teacher/laboratoryManagement/teacher/laboratoryApplicationRecord.vue 0 → 100644
<!--教师-->
<template>
<van-nav-bar title="教师实验室申请记录" left-text="返回" left-arrow @click-left="goback"></van-nav-bar>
<div>
<!-- 搜索框 -->
<form action="/">
<van-search
v-model="searchValue"
show-action
placeholder="请输入搜索关键词"
@search="onSearch"
@cancel="onCancel"
/>
</form>
<!--学年/学期 -->
<schoolYear @select="handleSelect"></schoolYear>
<van-pull-refresh v-model="refreshing" @refresh="onRefresh">
<van-list
v-model:loading="loading"
:finished="finished"
finished-text="没有更多了"
@load="onLoad"
>
<div v-for="(item,index) in list" :key="index">
<div class="card" @click="toDetail(item.id)">
<div class="topContent">
<div class="topLeft">
<van-image v-if="item.sub == '1'" style="height: 20px;width: 20px;vertical-align: middle"
:src="require('../../../../assets/icon/physics.png')"></van-image>
<van-image v-if="item.sub == '3'" style="height: 20px;width: 20px;vertical-align: middle"
:src="require('../../../../assets/icon/biology.png')"></van-image>
<van-image v-if="item.sub == '2'" style="height: 20px;width: 20px;vertical-align: middle"
:src="require('../../../../assets/icon/chemistry.png')"></van-image>
<span
style="font-size: 16px;font-weight: bold;padding-left: 5px">{{ item.sub == '1' ? '物理' : item.sub == '2' ? '化学' : '生物' }}研究</span>
</div>
<div class="topRight">
<div v-if="item.applyState == '0'" class="assigned">未回复</div>
<div v-if="item.applyState == '1'" class="unAssigned">已回复</div>
</div>
</div>
<div class="middleContent">
<div style="width: 60%">
<span>级部：</span>
<span>2021级</span>
</div>
<div style="width: 40%;">
<span>学期：</span>
<span>2022下学期</span>
</div>
</div>
<div class="bottomContent" style="padding-bottom: 20px">
<div style="width: 60%">
<span>实验时间：</span>
<span>2023-08-16</span>
</div>
<div style="width: 40%;overflow: hidden; white-space: nowrap; text-overflow: ellipsis">
<span>实验室：</span>
<span>101、401、102、103、104</span>
</div>
</div>
</div>
</div>
</van-list>
</van-pull-refresh>
</div>
</template>
<script setup>
import {getLabApplyList} from '@/service/laboratoryManagement'
import {reactive, onMounted, toRefs, ref} from "vue";
import {useStore} from "vuex";
import {useRouter, useRoute} from "vue-router";
import {formatDate} from "@/utils/time";
import {Toast} from "vant";
const store = useStore();
const router = useRouter();
const semester = ref('');
const year = ref('');
//选中学年的参数
const handleSelect = (value) => {
console.log('handleSelect', value)
year.value = value[0];
semester.value = value[1];
onLoad()
}
//列表数据
const list = ref([]);
//loading 和 finished 两个变量控制加载状态
//当组件滚动到底部时，会触发 load 事件并将 loading 设置成 true。
//此时可以发起异步操作并更新数据，数据更新完毕后，将 loading 设置成 false 即可。
// 若数据已全部加载完毕，则直接将 finished 设置成 true 即可。
const loading = ref(false);
const finished = ref(false);
const refreshing = ref(false);
const searchValue = ref('');
//列表加载事件
const onLoad = async () => {
if (refreshing.value) {
list.value = [];
refreshing.value = false;
}
console.log('semester.value', semester.value)
if (semester.value == '上学期' || semester.value == '1') {
semester.value = '1'
} else {
semester.value = '2'
}
const params = {
schoolYear: year.value,
semester: semester.value,
querText: searchValue.value,
userId: store.state.userInfo.userId
}
console.log('params', params)
//接口
let result = await getLabApplyList(params)
console.log('result', result)
if (result.code == 200) {
loading.value = false;
list.value = result.data
finished.value = true
} else {
Toast("获取信息失败!");
finished.value = true;
loading.value = false;
return;
}
}
//card点击事件
const toDetail = (id) => {
router.push({
path: '/laboratoryManagement/laboratoryApplicationRecord/checkLaboratoryApplication',
query: {
id: id
}
})
}
//下拉刷新
const onRefresh = () => {
//// 清空列表数据
finished.value = false;
// 重新加载数据
// 将 loading 设置为 true，表示处于加载状态
loading.value = true;
onLoad()
};
//搜索
const onSearch = (val) => {
onLoad()
};
//取消
const onCancel = () => {
onLoad()
};
//返回上一页
const goback = () => {
router.back();
}
</script>
<style scoped>
.card {
background: #FFFFFF;
margin: 10px;
border-radius: 20px;
}
.topContent {
display: flex;
flex-direction: row;
justify-content: space-between;
padding-top: 15px;
padding-bottom: 10px;
}
.topLeft {
margin-left: 20px;
display: flex;
align-items: center;
justify-content: center;
}
.topRight {
margin-top: -5px;
text-align: center;
width: 60px;
height: 20px;
line-height: 25px;
color: #FFFFFF;
font-size: 14px;
margin-right: 10px;
}
.assigned {
background: #00c15d;
border-radius: 10px;
}
.unAssigned {
background: #4ea0fc;
border-radius: 10px;
}
.time {
margin-left: 20px;
margin-right: 20px;
height: 20px;
line-height: 20px;
border-bottom: 1px solid #aebdc5;
padding-bottom: 10px;
}
.bottomContent, .middleContent {
font-size: 14px;
margin: 10px 20px;
padding-bottom: 10px;
display: flex;
flex-direction: row;
/*justify-content: space-between;*/
color: #6f787d;
}
.middleContent {
border-bottom: 1px solid silver;
}
.experimentType {
justify-content: center;
align-items: center;
font-size: 14px;
display: flex;
flex-direction: column;
}
.schoolYearNew {
font-size: 12px;
width: 165px;
height: 30px;
margin-top: 5px;
margin-left: 20px;
border: 1px solid silver;
border-radius: 5px
}
.van-cell.van-field.schoolYearNew {
padding: 0px !important;
height: 30px;
line-height: 30px;
}
</style>
src/views/teacher/laboratoryManagement/teacher/laboratoryArrangement.vue 0 → 100644
<!--教师申请-实验室安排-->
<template>
<van-nav-bar title="教师实验室安排" left-text="返回" left-arrow @click-left="goback" ></van-nav-bar>
<div>
<!-- 搜索框 -->
<form action="/">
<van-search
v-model="searchValue"
show-action
placeholder="搜索级部、实验名称"
@search="onSearch"
@cancel="onCancel"
/>
</form>
<!--学年/学期 -->
<schoolYear @select="handleSelect"></schoolYear>
<van-pull-refresh v-model="refreshing" @refresh="onRefresh">
<van-list
v-model:loading="loading"
:finished="finished"
finished-text="没有更多了"
@load="onLoad"
>
<div v-for="(item,index) in list" :key="index">
<div class="card" @click="toDetail(item.id)">
<div class="topContent">
<div class="topLeft">
<van-image v-if="item.sub == '1'" style="height: 20px;width: 20px;vertical-align: middle" :src="require('../../../../assets/icon/physics.png')"></van-image>
<van-image v-if="item.sub == '3'" style="height: 20px;width: 20px;vertical-align: middle" :src="require('../../../../assets/icon/biology.png')"></van-image>
<van-image v-if="item.sub == '2'" style="height: 20px;width: 20px;vertical-align: middle" :src="require('../../../../assets/icon/chemistry.png')"></van-image>
<span style="font-size: 16px;font-weight: bold;padding-left: 5px">{{item.sub == '1' ? '物理' : item.sub == '2' ? '化学' : '生物'}}研究</span>
</div>
<div class="topRight">
<div class="assigned" @click="toApply(item.id)">申请</div>
<!-- <div class="unAssigned">未分配</div>-->
</div>
</div>
<div class="middleContent">
<div style="width: 60%">
<span>级部：</span>
<span>{{ item.grade }}</span>
</div>
<div style="width: 40%;">
<span>学期：</span>
<span>{{ item.schoolYear }}{{item.semester == '1' ? '上学期':'下学期'}} </span>
</div>
</div>
<div class="bottomContent" style="padding-bottom: 20px">
<div style="width: 60%">
<span>实验时间：</span>
<span>{{ item.experimentTime }}</span>
</div>
<div style="width: 40%;overflow: hidden; white-space: nowrap; text-overflow: ellipsis">
<span>实验室：</span>
<span>{{ item.labName }}</span>
</div>
</div>
</div>
</div>
</van-list>
</van-pull-refresh>
</div>
</template>
<script setup>
import { getGradeAppointmentList } from '@/service/laboratoryManagement'
import { reactive, onMounted, toRefs, ref } from "vue";
import { useStore } from "vuex";
import { useRouter, useRoute } from "vue-router";
import { formatDate } from "@/utils/time";
import {Toast} from "vant";
const store = useStore();
const router = useRouter();
const semester = ref('');
const year = ref('');
const searchValue = ref('');
//选中学年的参数
const handleSelect = (value) => {
console.log('handleSelect', value)
year.value = value[0];
semester.value = value[1];
onLoad()
}
//列表数据
const list = ref([]);
//loading 和 finished 两个变量控制加载状态
//当组件滚动到底部时，会触发 load 事件并将 loading 设置成 true。
//此时可以发起异步操作并更新数据，数据更新完毕后，将 loading 设置成 false 即可。
// 若数据已全部加载完毕，则直接将 finished 设置成 true 即可。
const loading = ref(false);
const finished = ref(false);
const refreshing = ref(false);
//列表加载事件
const onLoad = async () => {
if (refreshing.value) {
list.value = [];
refreshing.value = false;
}
console.log('semester.value',semester.value)
if(semester.value == '上学期' ||semester.value == '1' ){
semester.value = '1'
}else{
semester.value = '2'
}
const params = {
schoolYear: year.value,
semester: semester.value,
querText: searchValue.value
}
console.log('params', params)
//接口
let result = await getGradeAppointmentList(params)
console.log('result',result)
if(result.code == 200){
loading.value = false;
list.value = result.data
finished.value = true
}else{
Toast("获取信息失败!");
finished.value = true;
loading.value = false;
return;
}
}
//card点击事件
const toDetail = (id) =>{
router.push({
path: '/laboratoryManagement/laboratoryArrangement/laboratoryArrangementDetail',
query:{
id:id,
name:'查看'
}
})
}
//申请按钮点击事件
const toApply = (id) => {
router.push({
path: '/laboratoryManagement/laboratoryArrangement/laboratoryArrangementDetail',
query:{
id:id,
name:'申请'
}
})
}
//下拉刷新
const onRefresh = () => {
//// 清空列表数据
finished.value = false;
// 重新加载数据
// 将 loading 设置为 true，表示处于加载状态
loading.value = true;
onLoad()
};
//搜索
const onSearch = (val) => {
onLoad()
};
//取消
const onCancel = () => {
onLoad()
};
//返回上一页
const goback = () => {
router.back();
}
</script>
<style scoped>
.card{
background: #FFFFFF;
margin: 10px;
border-radius: 20px;
}
.topContent{
display: flex;
flex-direction: row;
justify-content: space-between;
padding-top: 15px;
padding-bottom: 10px;
}
.topLeft{
margin-left: 20px;
display: flex;
align-items: center;
justify-content: center;
}
.topRight{
margin-top: -5px;
text-align: center;
width: 60px;
height: 20px;
line-height: 25px;
color: #FFFFFF;
font-size: 14px;
margin-right: 10px;
}
.assigned{
background:#00c15d ;
border-radius: 10px;
}
.unAssigned{
background:#4ea0fc ;
border-radius: 10px;
}
.time{
margin-left: 20px;
margin-right: 20px;
height: 20px;
line-height: 20px;
border-bottom:1px solid #aebdc5 ;
padding-bottom: 10px;
}
.bottomContent,.middleContent{
font-size: 14px;
margin: 10px 20px;
padding-bottom: 10px;
display: flex;
flex-direction: row;
/*justify-content: space-between;*/
color: #6f787d;
}
.middleContent{
border-bottom: 1px solid silver;
}
.experimentType{
justify-content: center;
align-items: center;
font-size: 14px;
display: flex;
flex-direction: column;
}
.schoolYearNew{
font-size:12px;
width: 165px;
height: 30px;
margin-top: 5px;
margin-left: 20px;
border: 1px solid silver;
border-radius: 5px
}
.van-cell.van-field.schoolYearNew{
padding: 0px!important;
height: 30px;
line-height: 30px;
}
</style>
src/views/teacher/laboratoryManagement/teacher/laboratoryArrangementDetail.vue 0 → 100644
<template>
<van-nav-bar :title="title" left-text="返回" left-arrow @click-left="goback" ></van-nav-bar>
<div class="topTitle">实验信息
</div>
<van-form>
<van-cell-group inset>
<van-field
v-model="formData.subject"
readonly
label="学科"
/>
<van-field
readonly
v-model="formData.level"
label="级部"
/>
<van-field
readonly
v-model="formData.semester"
label="学期"
/>
<van-field
v-if="name == '查看'"
readonly
v-model="formData.time"
label="实验时间"
/>
<van-field
readonly
v-model="formData.name"
label="实验名称"
/>
<van-field
readonly
v-model="formData.name"
label="实验分类"
/>
<!-- <div v-if="name == '申请'">-->
<!-- <van-field-->
<!-- is-link-->
<!-- readonly-->
<!-- v-model="formData.classify"-->
<!-- label="实验分类"-->
<!-- @click="showPickerClassify = true"-->
<!-- />-->
<!-- <van-popup v-model:show="showPickerClassify" position="bottom">-->
<!-- <van-picker-->
<!-- :columns="columnsClassify"-->
<!-- @confirm="onConfirmClassify"-->
<!-- @cancel="showPickerClassify = false"-->
<!-- />-->
<!-- </van-popup>-->
<!-- </div>-->
<van-field
v-if="name == '查看'"
readonly
v-model="formData.classify"
label="实验分类"
/>
<van-field
readonly
v-model="formData.chapter"
label="章节内容"
/>
<div v-if="name == '申请'">
<van-field
v-model="formData.laboratory"
is-link
readonly
name="picker"
label="实验室"
placeholder="选择实验室"
@click="showPickerLab = true"
/>
<van-popup v-model:show="showPickerLab" position="bottom">
<van-picker
:columns="columnsLab"
@confirm="onConfirmLab"
@cancel="showPickerLab = false"
/>
</van-popup>
</div>
<van-field
v-if="name == '查看'"
readonly
v-model="formData.laboratory"
label="实验室"
/>
<van-field
v-if="name == '申请'"
v-model="formData.time"
is-link
readonly
name="datetimePicker"
label="实验时间"
placeholder="点击选择实验时间"
@click="showPickerTime = true"
/>
<van-popup v-model:show="showPickerTime" position="bottom">
<van-datetime-picker
v-model="formData.time"
type="datetime"
title="选择完整时间"
:min-date="minDate"
:max-date="maxDate"
@confirm="onConfirmTime"
@cancel="showPickerTime = false"
/>
</van-popup>
<van-field
v-if="name == '查看'"
readonly
v-model="formData.laboratory"
label="节次"
/>
<van-field
v-if="name == '申请'"
v-model="formData.section"
label="节次"
readonly
is-link
placeholder="选择节次"
@click="showPickerSection = true"
/>
<van-popup v-model:show="showPickerSection" position="bottom">
<van-picker
:columns="columnsSection"
@confirm="onConfirmSection"
@cancel="showPickerSection = false"
/>
</van-popup>
<van-field
v-if="name == '查看'"
readonly
v-model="formData.laboratory"
label="班级"
/>
<van-field
v-if="name == '申请'"
v-model="formData.class"
label="班级"
is-link
readonly
placeholder="选择班级"
@click="showPickerClass = true"
/>
<van-popup v-model:show="showPickerClass" position="bottom">
<van-picker
:columns="columnsClass"
@confirm="onConfirmClass"
@cancel="showPickerClass = false"
/>
</van-popup>
<div style="margin: 10px">
<div style="font-size: 16px;margin: 8px;font-size: 14px;color: #646566">实验用品</div>
<van-field
readonly
style="border: 1px solid #ebedf0;border-radius: 10px"
name="message"
v-model="formData.message"
rows="3"
autosize
type="textarea"
/>
</div>
</van-cell-group>
<div v-if="name == '查看'" style="margin: 16px;">
<van-button round block type="primary" @click="goback">
关闭
</van-button>
</div>
<div v-else style="margin: 20px;display: flex;justify-content: center">
<van-button style="margin-right: 50px;width: 90px;height: 30px" round type="primary" native-type="submit">
同意
</van-button>
<van-button style="width: 90px;height: 30px" round type="success" @click="goback">
取消
</van-button>
</div>
</van-form>
</template>
<script setup>
import { getLabPlanDetail } from '@/service/laboratoryManagement'
import { reactive, onMounted, toRefs, ref } from "vue";
import { useStore } from "vuex";
import { useRouter, useRoute } from "vue-router";
import { formatDate } from "@/utils/time";
import {Toast} from "vant";
const store = useStore();
const router = useRouter();
const route = useRoute();
const title = ref('')
const name = route.query.name
//日期时间选择
minDate : new Date();// 最小的可选的日期
maxDate: new Date(); // 最大的可选日期
const formData = reactive({
subject:'',
level:'',
semester:'',
time:'',
name:'',
classify:'',
chapter:'',
laboratory:'',
section:'',
class:'',
message:''
})
onMounted(async () => {
if(name == '申请'){
title.value = '教师实验室申请'
}
if(name == '查看'){
title.value = '教师实验室安排明细'
let result = await getLabPlanDetail(route.query.id)
console.log('result',result)
}
})
//日期时间选择器
const showPickerTime = ref(false);
const onConfirmTime = (value) => {
formData.time = value;
showPickerTime.value = false;
};
//实验分类下拉框
const showPickerClassify = ref(false);
const columnsClassify = ['杭州', '宁波', '温州', '嘉兴', '湖州'];
const onConfirmClassify = (value) => {
formData.Classify = value;
showPickerClassify.value = false;
};
//实验室分类下拉框
const showPickerLab = ref(false);
const columnsLab = ['杭州', '宁波', '温州', '嘉兴', '湖州'];
const onConfirmLab = (value) => {
formData.laboratory = value;
showPickerLab.value = false;
};
//节次分类下拉框
const showPickerSection = ref(false);
const columnsSection = ['杭州', '宁波', '温州', '嘉兴', '湖州'];
const onConfirmSection = (value) => {
formData.section = value;
showPickerSection.value = false;
};
//班级分类下拉框
const showPickerClass = ref(false);
const columnsClass = ['杭州', '宁波', '温州', '嘉兴', '湖州'];
const onConfirmClass = (value) => {
formData.class = value;
showPickerClass.value = false;
};
const checkForm = reactive({
})
//返回上一页
const goback = () => {
router.back();
}
</script>
<style scoped>
</style>
src/views/teacher/safetyManagement/carAccessRegistration.vue 0 → 100644
<template>
<van-nav-bar title="车辆出入登记" left-text="返回" left-arrow @click-left="goback"></van-nav-bar>
<div>
<!-- 搜索框 -->
<form action="/">
<van-search
v-model="searchValue"
show-action
placeholder="请输入车号"
@search="onSearch"
>
<template #action>
<van-button style="vertical-align: middle" type="primary" size="mini" @click="onSearch">搜索</van-button>
<van-button style="vertical-align: middle" type="primary" size="mini" @click="onReset">重置</van-button>
<van-button style="vertical-align: middle" type="primary" size="mini" @click="addNew">新增</van-button>
</template>
</van-search>
</form>
<!--列表 -->
<van-pull-refresh v-model="refreshing" @refresh="onRefresh">
<van-list
v-model:loading="loading"
:finished="finished"
finished-text="没有更多了"
@load="onLoad"
>
<div style="position: relative" v-for="(item,index) in list" :key="index">
<div class="card" @click="toDetail(item.id)">
<div class="title">
<span class="name">张三</span>
<span class="point"></span>
<span class="grade">在编</span>
</div>
<div class="content">
<div style="margin-bottom: 10px">车主联系电话：15566667777</div>
<div style="margin-bottom: 10px">车辆品牌：奔驰</div>
<div style="margin-bottom: 10px">车型：SUV</div>
<div style="margin-bottom: 10px">现申请登记车号：鲁E88888</div>
<div style="margin-bottom: 10px">已登记车辆车号：鲁E77777</div>
<div style="margin-bottom: 10px">已登记车辆是否保留：是</div>
</div>
<div class="timeContent">
<div class="time">2021/10/13 - 无限期</div>
<div>预计在校工作时间</div>
</div>
</div>
<div class="button">
<van-button class="editBtn btn" size="mini" type="warning">编辑</van-button>
<van-button class="submitBtn btn" size="mini" type="primary">提交</van-button>
<van-button class="delBtn btn" size="mini" type="danger">删除</van-button>
</div>
<div class="status">
<!-- <div class="unSubmit">未提交</div>-->
<!-- <div class="level">级部处室审核</div>-->
<!-- <div class="branch">分管领导审核</div>-->
<div class="end">已结束</div>
</div>
</div>
</van-list>
</van-pull-refresh>
</div>
</template>
<script setup>
import {getClassCompleteDetail} from '@/service/laboratoryManagement'
import {reactive, onMounted, toRefs, ref} from "vue";
import {useStore} from "vuex";
import {useRouter, useRoute} from "vue-router";
import {formatDate} from "@/utils/time";
import {Toast} from "vant";
const store = useStore();
const router = useRouter();
const route = useRoute();
//列表数据
const list = ref([1, 2, 3]);
//loading 和 finished 两个变量控制加载状态
//当组件滚动到底部时，会触发 load 事件并将 loading 设置成 true。
//此时可以发起异步操作并更新数据，数据更新完毕后，将 loading 设置成 false 即可。
// 若数据已全部加载完毕，则直接将 finished 设置成 true 即可。
const loading = ref(false);
const finished = ref(false);
const refreshing = ref(false);
const username = ref('')
const searchValue = ref('');
onMounted(() => {
// onLoad()
})
//重置按钮
const onReset = () => {
}
//新增按钮
const addNew = () => {
}
//列表加载事件
const onLoad = async () => {
if (refreshing.value) {
list.value = [];
refreshing.value = false;
}
// const params = {
//
// }
//接口
// let result = await getClassCompleteDetail(params)
// console.log('result',result)
// if(result.code == 200){
// loading.value = false;
// list.value = result.data
// finished.value = true
// }else {
// Toast("获取信息失败!");
// finished.value = true;
// loading.value = false;
// return;
// }
}
//下拉刷新
const onRefresh = () => {
//// 清空列表数据
finished.value = false;
// 重新加载数据
// 将 loading 设置为 true，表示处于加载状态
loading.value = true;
onLoad()
};
//搜索
const onSearch = (val) => {
onLoad()
};
//取消
const onCancel = () => {
onLoad()
};
//返回上一页
const goback = () => {
router.back();
}
</script>
<style scoped>
.card {
background: #FFFFFF;
margin: 10px;
border-radius: 20px;
position: relative;
padding-bottom: 5px;
}
.title {
padding: 10px ;
}
.name {
margin-right: 20px;
}
.point {
vertical-align: middle;
display: inline-block;
width: 5px;
height: 5px;
background: #000000;
border-radius: 50%;
margin-right: 20px;
}
.content {
margin-left: 10px;
/*padding-bottom: 50px;*/
font-size: 14px;
}
.button{
position: absolute;
/*display: flex;*/
/*flex-direction: column;*/
/*align-items: flex-end;*/
right: 20px;
bottom: 5px;
}
.timeContent{
font-size: 14px;
position: absolute;
right: 15px;
top: 50%;
text-align: center;
}
.time{
color: #4ea0fc;
font-weight: bold;
}
.btn{
width: 45px;
height: 25px;
line-height: 25px;
margin-bottom: 5px;
border-radius: 5px;
}
.status{
position: absolute;
top: 0;
right: 10px;
font-size: 14px;
height: 25px;
text-align: center;
}
.unSubmit{
background: #00c15d;
color: #FFFFFF;
border-radius: 5px;
padding: 0 5px;
}
.level{
background: #e5c35d;
color: #FFFFFF;
border-radius: 5px;
padding: 0 5px;
}
.branch{
background: #4ea0fc;
color: #FFFFFF;
border-radius: 5px;
padding: 0 5px;
}
.end{
background: #b74b3f;
color: #FFFFFF;
border-radius: 5px;
padding: 0 5px;
}
</style>
src/views/teacher/laboratoryManagement/checkComplete.vue → src/views/teacher/safetyManagement/carAccessRegistrationApply.vue
<template> <template>
<van-nav-bar title="实验室完成情况统计" left-text="返回" left-arrow @click-left="goback" ></van-nav-bar> <div>车辆出入登记申请列表</div>
</template> </template>
<script setup> <script setup>
......
src/views/teacher/safetyManagement/index.vue 0 → 100644
<template>
<van-nav-bar title="安全管理" left-text="返回" left-arrow @click-left="goback" ></van-nav-bar>
<!--个人安全管理 -->
<!-- <div v-if="leaderRole == true">-->
<div class="carRecord" @click="toPage(1)">
<van-image class="leftImg" :src="require('../../../assets/icon/carRecord.png')"/>
<div>车辆出入登记</div>
</div>
<div class="monitor" @click="toPage(2)">
<van-image class="leftImg" :src="require('../../../assets/icon/monitor.png')"/>
<div>监控录像调阅</div>
</div>
<!-- </div>-->
<!--信息中心监控管理 -->
<!-- <div v-if="managerRole == true">-->
<div class="monitorInner" @click="toPage(3)">
<van-image class="leftImg" :src="require('../../../assets/icon/monitorInner.png')"/>
<div>监控调阅内部</div>
</div>
<div class="monitorOuter" @click="toPage(4)">
<van-image class="leftImg" :src="require('../../../assets/icon/monitorOuter.png')"/>
<div>监控调阅外部</div>
</div>
<!--安全管理员-->
<!-- <div v-if="levelPartRole == true">-->
<div class="carForm" @click="toPage(5)">
<van-image class="leftImg" :src="require('../../../assets/icon/carForm.png')"/>
<div>车辆登记表</div>
</div>
<div class="carApply" @click="toPage(6)">
<van-image class="leftImg" :src="require('../../../assets/icon/carApply.png')"/>
<div>车辆出入登记申请列表</div>
</div>
<div class="monitorInnerApply" @click="toPage(7)">
<van-image class="leftImg" :src="require('../../../assets/icon/monitorInnerApply.png')"/>
<div>监控调阅内部申请列表</div>
</div>
<div class="monitorOuterApply" @click="toPage(8)">
<van-image class="leftImg" :src="require('../../../assets/icon/monitorOuterApply.png')"/>
<div>监控调阅外部申请列表</div>
</div>
<!-- </div>-->
</template>
<script setup>
import { reactive, onMounted, toRefs, ref } from "vue";
import { useStore } from "vuex";
import { useRouter, useRoute } from "vue-router";
import { formatDate } from "@/utils/time";
import {Toast} from "vant";
const store = useStore()
const router = useRouter()
//权限字段
const rolesArr = store.state.userInfo.roles
// 领导权限
const leaderRole = ref()
//实验室管理员
const managerRole = ref()
//级部
const levelPartRole = ref()
//教师
const teacherRole = ref()
onMounted(()=>{
//查找角色
//领导-校领导
// rolesArr.find(item => {
// if(item == 'schoolLeader'){
// return leaderRole.value = true
// }else{
// leaderRole.value = false
// }
// })
// 级部-级部主任
// rolesArr.find(item => {
// if(item == 'gradeLeader'){
// return levelPartRole.value = true
// }else{
// levelPartRole.value = false
// }
// })
//实验室管理员
// rolesArr.find(item => {
// if(item == 'phy_lab_admin' || item == 'che_lab_admin' || item == 'bio_lab_admin'){
// return managerRole.value = true
// }else{
// managerRole.value = false
// }
// })
//教师
// rolesArr.find(item => {
// if(item == 'teacher'){
// return teacherRole.value = true
// }else{
// teacherRole.value = false
// }
// })
})
const toPage = (type) => {
if(type == 1){
//个人安全管理-车辆出入登记
router.push({
path:'/safetyManagement/carAccessRegistration',
})
}
if(type == 2){
//个人安全管理-监控录像调阅
router.push({
path:'/safetyManagement/monitoringCall',
query:{
type:2
}
})
}
if(type == 3){
//信息中心监控管理-监控调阅内部
router.push({
path:"/safetyManagement/monitoringCallInside"
})
}
if(type == 4){
//信息中心监控管理-监控调阅外部
router.push({
path:'/safetyManagement/monitoringCallOutside',
})
}
if(type == 5){
//安全管理-车辆登记表
router.push({
path:'/safetyManagement/vehicleRegistration',
})
}
if(type == 6){
//安全管理-车辆出入登记申请列表
router.push({
path:'/safetyManagement/carAccessRegistrationApply',
})
}
if(type == 7){
//安全管理-监控调阅内部申请列表
router.push({
path:'/safetyManagement/monitoringCallInsideApply',
})
}
if(type == 8){
//安全管理-监控调阅外部申请列表
router.push({
path:'/safetyManagement/monitoringCallOutsideApply',
})
}
}
//返回上一页
const goback = () => {
router.back();
}
</script>
<style scoped>
.carRecord,.monitor,.monitorInner,.monitorOuter,.carForm,
.monitorInnerApply,.monitorOuterApply,.carApply{
padding: 20px 25px;
border-radius: 12px;
color: #FFFFFF;
margin: 15px;
display: flex;
flex-direction: row;
align-items: center;
font-size: 23px;
font-weight: bold;
}
.carRecord{
background: linear-gradient(to right, #84e3f4, #4887a0);
}
.monitor{
background: linear-gradient(to right, #89aecb, #438dcd);
}
.monitorInner{
background: linear-gradient(to right, #a5dec5, #1aa791);
}
.monitorOuter{
background: linear-gradient(to right, #a9aae2, #5e43de);
}
.carForm{
background: linear-gradient(to right, #cde294, #6fcadb);
}
.carApply{
background: linear-gradient(to right, #b0e7e2, #12a1c6);
}
.monitorInnerApply{
background: linear-gradient(to right, #7fdc8f, #b4e03f);
}
.monitorOuterApply{
background: linear-gradient(to right, #9cc0dc, #517acd);
}
.leftImg {
width: 56px;
height: 56px;
margin-right: 10%;
}
</style>
src/views/teacher/safetyManagement/monitoringCall.vue 0 → 100644
<template>
<van-nav-bar title="监控录像调阅" left-text="返回" left-arrow @click-left="goback"></van-nav-bar>
<div>
<!-- 搜索框 -->
<form action="/">
<van-search
v-model="searchValue"
show-action
placeholder="请输入车号"
@search="onSearch"
>
<template #action>
<van-button style="vertical-align: middle" type="primary" size="mini" @click="onSearch">搜索</van-button>
<van-button style="vertical-align: middle" type="primary" size="mini" @click="onReset">重置</van-button>
<van-button style="vertical-align: middle" type="primary" size="mini" @click="addNew">新增</van-button>
</template>
</van-search>
</form>
<!--列表 -->
<van-pull-refresh v-model="refreshing" @refresh="onRefresh">
<van-list
v-model:loading="loading"
:finished="finished"
finished-text="没有更多了"
@load="onLoad"
>
<div style="position: relative" v-for="(item,index) in list" :key="index">
<div class="card" @click="toDetail(item.id)">
<div class="title">
<span class="name">张三</span>
<span class="point"></span>
<span class="grade">2022级部</span>
</div>
<div class="content">
<div style="margin-bottom: 10px">联系电话：</div>
<div style="margin-bottom: 10px">调阅位置：</div>
<div style="margin-bottom: 10px">申请事由：</div>
<div style="margin-bottom: 10px">调取录像时间：2023/09/01 09:30至2023/09/02 09:30</div>
</div>
</div>
<div class="button">
<van-button class="editBtn btn" size="mini" type="warning">编辑</van-button>
<van-button class="submitBtn btn" size="mini" type="primary">提交</van-button>
<van-button class="delBtn btn" size="mini" type="danger">删除</van-button>
</div>
<div class="status">
<div class="unSubmit">未提交</div>
<!-- <div class="level">级部/中心审核</div>-->
<!-- <div class="info">信息技术中心负责人审核</div>-->
<!-- <div class="safe">安全管理中心负责人审核</div>-->
<!-- <div class="branch">分管领导审核</div>-->
<!-- <div class="end">结束</div>-->
</div>
</div>
</van-list>
</van-pull-refresh>
</div>
</template>
<script setup>
import {getClassCompleteDetail} from '@/service/laboratoryManagement'
import {reactive, onMounted, toRefs, ref} from "vue";
import {useStore} from "vuex";
import {useRouter, useRoute} from "vue-router";
import {formatDate} from "@/utils/time";
import {Toast} from "vant";
const store = useStore();
const router = useRouter();
const route = useRoute();
//列表数据
const list = ref([1, 2, 3]);
//loading 和 finished 两个变量控制加载状态
//当组件滚动到底部时，会触发 load 事件并将 loading 设置成 true。
//此时可以发起异步操作并更新数据，数据更新完毕后，将 loading 设置成 false 即可。
// 若数据已全部加载完毕，则直接将 finished 设置成 true 即可。
const loading = ref(false);
const finished = ref(false);
const refreshing = ref(false);
const username = ref('')
const searchValue = ref('');
onMounted(() => {
// onLoad()
})
//重置按钮
const onReset = () => {
}
//新增按钮
const addNew = () => {
}
//列表加载事件
const onLoad = async () => {
if (refreshing.value) {
list.value = [];
refreshing.value = false;
}
// const params = {
//
// }
//接口
// let result = await getClassCompleteDetail(params)
// console.log('result',result)
// if(result.code == 200){
// loading.value = false;
// list.value = result.data
// finished.value = true
// }else {
// Toast("获取信息失败!");
// finished.value = true;
// loading.value = false;
// return;
// }
}
//下拉刷新
const onRefresh = () => {
//// 清空列表数据
finished.value = false;
// 重新加载数据
// 将 loading 设置为 true，表示处于加载状态
loading.value = true;
onLoad()
};
//搜索
const onSearch = (val) => {
onLoad()
};
//取消
const onCancel = () => {
onLoad()
};
//返回上一页
const goback = () => {
router.back();
}
</script>
<style scoped>
.card {
background: #FFFFFF;
margin: 10px;
border-radius: 20px;
}
.title {
padding: 10px ;
}
.name {
margin-right: 20px;
}
.point {
vertical-align: middle;
display: inline-block;
width: 5px;
height: 5px;
background: #000000;
border-radius: 50%;
margin-right: 20px;
}
.content {
margin-left: 10px;
padding-bottom: 50px;
font-size: 14px;
}
.button{
position: absolute;
/*display: flex;*/
/*flex-direction: column;*/
/*align-items: flex-end;*/
right: 20px;
bottom: 10px;
}
.btn{
width: 45px;
height: 25px;
line-height: 25px;
margin-bottom: 5px;
border-radius: 5px;
}
.status{
position: absolute;
top: 0;
right: 0;
}
</style>
src/views/teacher/safetyManagement/monitoringCallInside.vue 0 → 100644
<template>
<div>监控调阅内部</div>
</template>
<script setup>
</script>
<style scoped>
</style>
src/views/teacher/safetyManagement/monitoringCallInsideApply.vue 0 → 100644
<template>
<div>监控调阅内部申请列表</div>
</template>
<script setup>
</script>
<style scoped>
</style>
src/views/teacher/safetyManagement/monitoringCallOutside.vue 0 → 100644
<template>
<div>监控调阅外部</div>
</template>
<script setup>
</script>
<style scoped>
</style>
src/views/teacher/safetyManagement/monitoringCallOutsideApply.vue 0 → 100644
<template>
<div>监控调阅外部申请列表</div>
</template>
<script setup>
</script>
<style scoped>
</style>
src/views/teacher/safetyManagement/vehicleRegistration.vue 0 → 100644
<template>
<div>车辆登记表</div>
</template>
<script setup>
</script>
<style scoped>
</style>
src/views/teacher/schoolProperty/borrowDetail.vue
...@@ -84,43 +84,54 @@ onMounted(async () => { ...@@ -84,43 +84,54 @@ onMounted(async () => {
console.log('queryEncode', queryEncode) console.log('queryEncode', queryEncode)
title.value = '物品借用新增' title.value = '物品借用新增'
let equipmentRes = await scanEquipmentInfo(queryEncode) let equipmentRes = await scanEquipmentInfo(queryEncode)
console.log('equipmentRes', equipmentRes) if(equipmentRes.code == 3000){
Object.assign(borrowForm, equipmentRes.data)
borrowForm.borrowBy = userName
borrowForm.borrowTime = formatDatetime(new Date())
console.log('borrowForm', borrowForm)
if (equipmentRes.data.affiliationType != 2) {
Dialog.alert({ Dialog.alert({
title: '提示', title: '提示',
message: '该设备不属于信息中心，不可借用', message: equipmentRes.msg,
}).then(() => { }).then(() => {
router.back(); router.back();
}); });
} }
else if (equipmentRes.data.equipmentState != 1) { if(equipmentRes.code == 200){
Dialog.alert({ console.log('equipmentRes', equipmentRes)
title: '提示', Object.assign(borrowForm, equipmentRes.data)
message: '该设备非完好状态，不可借用', borrowForm.borrowBy = userName
}).then(() => { borrowForm.borrowTime = formatDatetime(new Date())
router.back(); console.log('borrowForm', borrowForm)
}); if (equipmentRes.data.affiliationType != 2) {
} Dialog.alert({
else if (equipmentRes.data.isAllowLend == 0) { title: '提示',
Dialog.alert({ message: '该设备不属于信息中心，不可借用',
title: '提示', }).then(() => {
message: '该设备不允许借用', router.back();
}).then(() => { });
router.back(); }
}); else if (equipmentRes.data.equipmentState != 1) {
} Dialog.alert({
else if(equipmentRes.data.isLend == 1){ title: '提示',
Dialog.alert({ message: '该设备非完好状态，不可借用',
title: '提示', }).then(() => {
message: '该设备已借出', router.back();
}).then(() => { });
router.back(); }
}); else if (equipmentRes.data.isAllowLend == 0) {
Dialog.alert({
title: '提示',
message: '该设备不允许借用',
}).then(() => {
router.back();
});
}
else if(equipmentRes.data.isLend == 1){
Dialog.alert({
title: '提示',
message: '该设备已借出',
}).then(() => {
router.back();
});
}
} }
} }
......
src/views/teacher/schoolProperty/borrowList.vue
<template> <template>
<van-nav-bar title="物品借用" left-text="返回" left-arrow @click-left="goback" ></van-nav-bar> <van-nav-bar title="物品借用" left-text="返回" left-arrow @click-left="goback" ></van-nav-bar>
<div class="flexBLock searchBlock"> <div class="flexBLock searchBlock">
<van-search class="searchInput" @search="onSearch" v-model="searchKey" placeholder="请输入搜索关键词" /> <van-search class="searchInput" @search="onSearch" v-model="searchKey" placeholder="请输入设备名称" />
<van-icon name="scan" @click="getCode" /> <van-icon name="scan" @click="getCode" />
</div> </div>
<van-pull-refresh v-model="pullLoading" @refresh="onRefresh"> <van-pull-refresh v-model="pullLoading" @refresh="onRefresh">
......
src/views/teacher/schoolProperty/deviceList.vue
<template> <template>
<van-nav-bar title="设备报修" left-text="返回" left-arrow @click-left="goback"></van-nav-bar> <div class="flexBLock searchBlock"> <van-nav-bar title="设备报修" left-text="返回" left-arrow @click-left="goback"></van-nav-bar> <div class="flexBLock searchBlock">
<van-search class="searchInput" @search="onSearch" v-model="searchKey" placeholder="请输入搜索关键词" /> <van-search class="searchInput" @search="onSearch" v-model="searchKey" placeholder="请输入设备名称" />
<van-icon name="scan" @click="getCode"/> <van-icon name="scan" @click="getCode"/>
</div> </div>
<van-pull-refresh v-model="pullLoading" @refresh="onRefresh"> <van-pull-refresh v-model="pullLoading" @refresh="onRefresh">
......
src/views/teacher/schoolProperty/deviceListInfo.vue
...@@ -48,15 +48,15 @@ ...@@ -48,15 +48,15 @@
placeholder="地点" placeholder="地点"
:rules="[{ required: true, message: '请填写地点' }]" :rules="[{ required: true, message: '请填写地点' }]"
/> />
<van-field <van-field
v-if="name == '反馈' ? false : true" v-if="name == '反馈' ? false : true"
v-model="fixForm.reportRepairTime" v-model="fixForm.reportRepairTime"
readonly readonly
name="calendar" name="calendar"
label="报修时间" label="报修时间"
placeholder="请填写报修时间" placeholder="请填写报修时间"
:rules="[{ required: true, message: '请填写报修时间' }]" :rules="[{ required: true, message: '请填写报修时间' }]"
/> />
<van-field <van-field
v-if="name == '反馈' ? false : true" v-if="name == '反馈' ? false : true"
readonly readonly
...@@ -180,12 +180,21 @@ ...@@ -180,12 +180,21 @@
</template> </template>
<script setup> <script setup>
import { getRepairName,addDevice,getDeviceDetail,editDevice,getFeedbackDetail,submitFeedback,scanEquipmentInfo } from "@/service/schoolProperty" import {
getRepairName,
addDevice,
getDeviceDetail,
editDevice,
getFeedbackDetail,
submitFeedback,
scanEquipmentInfo
} from "@/service/schoolProperty"
import {formatDatetime} from "@/utils/time.js" import {formatDatetime} from "@/utils/time.js"
import {useRoute, useRouter} from "vue-router"; import {useRoute, useRouter} from "vue-router";
import {ref, onMounted, reactive} from "vue"; import {ref, onMounted, reactive} from "vue";
import {useStore} from "vuex"; import {useStore} from "vuex";
import {Toast} from "vant"; import {Dialog, Toast} from "vant";
const router = useRouter(); const router = useRouter();
const route = useRoute(); const route = useRoute();
const store = useStore(); const store = useStore();
...@@ -197,34 +206,34 @@ const name = route.query.name; ...@@ -197,34 +206,34 @@ const name = route.query.name;
const id = route.query.id; const id = route.query.id;
const encode = route.query.encode; const encode = route.query.encode;
const fixForm = reactive({ const fixForm = reactive({
encode:'', //自编码 encode: '', //自编码
equipmentName:'', //设备名称 equipmentName: '', //设备名称
model:'', //型号 model: '', //型号
dateOfProduction:'', //投产日期 dateOfProduction: '', //投产日期
place:'', //地点 place: '', //地点
reportRepairTime:'', //报修时间 reportRepairTime: '', //报修时间
reportRepair:'', //报修人 reportRepair: '', //报修人
problem:'', //问题 problem: '', //问题
repairName:'', //修理人 repairName: '', //修理人
repairId:'', //修理人id repairId: '', //修理人id
repairPhone:'', //修理人电话 repairPhone: '', //修理人电话
repairTime:'', //修理时间 repairTime: '', //修理时间
repairState:'', //维修结果 repairState: '', //维修结果
repairStateName:'',//维修结果文本 repairStateName: '',//维修结果文本
remark:'', //备注 remark: '', //备注
}) })
const evaluate = ref(); const evaluate = ref();
const showState = ref(false); const showState = ref(false);
const stateColumns = [{ const stateColumns = [{
text:'已维修', text: '已维修',
id:0 id: 0
},{ }, {
text:'已损坏', text: '已损坏',
id:1 id: 1
}]; }];
//维修结果 //维修结果
const repairState = (value) => { const repairState = (value) => {
console.log('value',value) console.log('value', value)
fixForm.repairStateName = value.text; fixForm.repairStateName = value.text;
fixForm.repairState = value.id; fixForm.repairState = value.id;
showState.value = false; showState.value = false;
...@@ -233,7 +242,7 @@ const showPicker = ref(false); ...@@ -233,7 +242,7 @@ const showPicker = ref(false);
const columns = ref([]); const columns = ref([]);
//修理人 //修理人
const onConfirm = (value) => { const onConfirm = (value) => {
console.log('value',value) console.log('value', value)
fixForm.repairName = value.text; fixForm.repairName = value.text;
fixForm.repairId = value.id; fixForm.repairId = value.id;
fixForm.repairPhone = value.phone fixForm.repairPhone = value.phone
...@@ -241,13 +250,13 @@ const onConfirm = (value) => { ...@@ -241,13 +250,13 @@ const onConfirm = (value) => {
}; };
onMounted(async () => { onMounted(async () => {
let repairResult = await getRepairName() let repairResult = await getRepairName()
console.log('repairResult',repairResult) console.log('repairResult', repairResult)
if(repairResult.code == 200){ if (repairResult.code == 200) {
columns.value = repairResult.data.map(item => { columns.value = repairResult.data.map(item => {
return { return {
text:item.repairName, text: item.repairName,
id:item.repairId, id: item.repairId,
phone:item.repairPhone phone: item.repairPhone
} }
}) })
console.log('columns.value', columns.value) console.log('columns.value', columns.value)
...@@ -255,23 +264,23 @@ onMounted(async () => { ...@@ -255,23 +264,23 @@ onMounted(async () => {
if (name == '修改') { if (name == '修改') {
title.value = '报修台账修改' title.value = '报修台账修改'
let editResult = await getDeviceDetail(id) let editResult = await getDeviceDetail(id)
console.log('editResult',editResult) console.log('editResult', editResult)
if(editResult.code == 200){ if (editResult.code == 200) {
Object.assign(fixForm,editResult.data) Object.assign(fixForm, editResult.data)
console.log('fixForm',fixForm) console.log('fixForm', fixForm)
} }
} }
if (name == '反馈') { if (name == '反馈') {
title.value = '报修台账反馈' title.value = '报修台账反馈'
let feedBack = await getFeedbackDetail(id) let feedBack = await getFeedbackDetail(id)
console.log('feedBack',feedBack) console.log('feedBack', feedBack)
if(feedBack.code == 200){ if (feedBack.code == 200) {
Object.assign(fixForm,feedBack.data) Object.assign(fixForm, feedBack.data)
fixForm.repairTime = formatDatetime(new Date()) fixForm.repairTime = formatDatetime(new Date())
// fixForm.repairState = stateColumns[feedBack.data.repairState] // fixForm.repairState = stateColumns[feedBack.data.repairState]
stateColumns.find(item => { stateColumns.find(item => {
if(item.id == feedBack.data.repairState){ if (item.id == feedBack.data.repairState) {
console.log('item',item) console.log('item', item)
fixForm.repairStateName = item.text fixForm.repairStateName = item.text
} }
}) })
...@@ -281,66 +290,77 @@ onMounted(async () => { ...@@ -281,66 +290,77 @@ onMounted(async () => {
if (name == '查看') { if (name == '查看') {
title.value = '报修台账查看' title.value = '报修台账查看'
let checkResult = await getDeviceDetail(id) let checkResult = await getDeviceDetail(id)
console.log('editResult',checkResult) console.log('editResult', checkResult)
if(checkResult.code == 200){ if (checkResult.code == 200) {
Object.assign(fixForm,checkResult.data) Object.assign(fixForm, checkResult.data)
console.log('fixForm',fixForm) console.log('fixForm', fixForm)
// fixForm.repairState = stateColumns[checkResult.data.repairState] // fixForm.repairState = stateColumns[checkResult.data.repairState]
stateColumns.find(item => { stateColumns.find(item => {
if(item.id == checkResult.data.repairState){ if (item.id == checkResult.data.repairState) {
console.log('item',item) console.log('item', item)
fixForm.repairStateName = item.text fixForm.repairStateName = item.text
} }
}) })
} }
} }
if(name == '新增'){ if (name == '新增') {
title.value = '新增报修台账' title.value = '新增报修台账'
let equipmentRes = await scanEquipmentInfo(queryEncode) let equipmentRes = await scanEquipmentInfo(queryEncode)
console.log('equipmentRes',equipmentRes.data) if (equipmentRes.code == 3000) {
Object.assign(fixForm,equipmentRes.data) Dialog.alert({
fixForm.reportRepairTime = formatDatetime(new Date()) title: '提示',
fixForm.reportRepair = userName message: equipmentRes.msg,
console.log('fixForm',fixForm) }).then(() => {
router.back();
});
}
if (equipmentRes.code == 200) {
console.log('equipmentRes', equipmentRes.data)
Object.assign(fixForm, equipmentRes.data)
fixForm.reportRepairTime = formatDatetime(new Date())
fixForm.reportRepair = userName
console.log('fixForm', fixForm)
}
} }
}); });
//点击报修按钮 //点击报修按钮
const onSubmit = async () => { const onSubmit = async () => {
if(id){ if (id) {
//修改 //修改
const params = { const params = {
id:id, id: id,
equipmentId:fixForm.equipmentId, equipmentId: fixForm.equipmentId,
classificationCode:fixForm.classificationCode, classificationCode: fixForm.classificationCode,
reportRepairTime:fixForm.reportRepairTime, reportRepairTime: fixForm.reportRepairTime,
reportRepairId:fixForm.reportRepairId, reportRepairId: fixForm.reportRepairId,
reportRepair:fixForm.reportRepair, reportRepair: fixForm.reportRepair,
problem:fixForm.problem problem: fixForm.problem
} }
console.log('params',params) console.log('params', params)
let result = await editDevice(params) let result = await editDevice(params)
console.log('result',result) console.log('result', result)
if(result.code == 200){ if (result.code == 200) {
Toast.success("修改成功"); Toast.success("修改成功");
router.back(); router.back();
} }
}else{ } else {
// 新增 // 新增
const params = { const params = {
equipmentId:fixForm.id, equipmentId: fixForm.id,
reportRepairTime:fixForm.reportRepairTime, reportRepairTime: fixForm.reportRepairTime,
classificationCode:fixForm.classificationCode, classificationCode: fixForm.classificationCode,
reportRepairId:userId, reportRepairId: userId,
reportRepair:fixForm.reportRepair, reportRepair: fixForm.reportRepair,
problem:fixForm.problem problem: fixForm.problem
} }
console.log('params',params) console.log('params', params)
let result = await addDevice(params) let result = await addDevice(params)
console.log('result',result) console.log('result', result)
if(result.code == 200){ if (result.code == 200) {
Toast.success("报修成功"); Toast.success("报修成功");
router.back(); router.back();
} }
...@@ -350,18 +370,18 @@ const onSubmit = async () => { ...@@ -350,18 +370,18 @@ const onSubmit = async () => {
const feedBack = async () => { const feedBack = async () => {
const params = { const params = {
id:Number(id), id: Number(id),
evaluate:evaluate.value ? evaluate.value.toString():'', evaluate: evaluate.value ? evaluate.value.toString() : '',
repairName:fixForm.repairName, repairName: fixForm.repairName,
repairId:fixForm.repairId, repairId: fixForm.repairId,
repairState:fixForm.repairState, repairState: fixForm.repairState,
repairPhone:fixForm.repairPhone, repairPhone: fixForm.repairPhone,
repairTime:fixForm.repairTime repairTime: fixForm.repairTime
} }
console.log('params',params) console.log('params', params)
let result = await submitFeedback(params) let result = await submitFeedback(params)
console.log('result',result) console.log('result', result)
if(result.code == 200){ if (result.code == 200) {
Toast.success("反馈成功"); Toast.success("反馈成功");
router.back(); router.back();
} }
......
src/views/teacher/schoolProperty/equipmentFix.vue
<template> <template>
<van-nav-bar title="设备维修" left-text="返回" left-arrow @click-left="goback"></van-nav-bar> <div class="flexBLock searchBlock"> <van-nav-bar title="设备维修" left-text="返回" left-arrow @click-left="goback"></van-nav-bar> <div class="flexBLock searchBlock">
<van-search class="search" v-model="searchKey" show-action placeholder="请输入搜索关键词" > <van-search class="search" v-model="searchKey" show-action placeholder="请输入设备名称" >
<template #action> <template #action>
<div @click="onClickSearch" >搜 索</div> <div @click="onClickSearch" >搜 索</div>
</template> </template>
......
src/views/teacher/schoolProperty/equipmentInfo.vue
...@@ -60,7 +60,7 @@ onMounted( async () => { ...@@ -60,7 +60,7 @@ onMounted( async () => {
if(result.code == 3000){ if(result.code == 3000){
Dialog.alert({ Dialog.alert({
title: '提示', title: '提示',
message: '该设备非完好状态，不可借用', message: result.msg,
}).then(() => { }).then(() => {
router.back(); router.back();
}); });
......
src/views/teacher/schoolProperty/returnDetail.vue
...@@ -6,17 +6,17 @@ ...@@ -6,17 +6,17 @@
<van-field readonly v-model="returnForm.encode" label="自编码" placeholder="请输入自编码"/> <van-field readonly v-model="returnForm.encode" label="自编码" placeholder="请输入自编码"/>
<van-field readonly v-model="returnForm.borrowBy" label="借用人" placeholder="请输入借用人"/> <van-field readonly v-model="returnForm.borrowBy" label="借用人" placeholder="请输入借用人"/>
<van-field readonly v-model="returnForm.receivedBy" label="接收人" placeholder="请输入接收人"/> <van-field readonly v-model="returnForm.receivedBy" label="接收人" placeholder="请输入接收人"/>
<!-- <div v-if="queryId">--> <!-- <div v-if="queryId">-->
<van-field readonly v-model="returnForm.borrowTime" label="借用日期"/> <van-field readonly v-model="returnForm.borrowTime" label="借用日期"/>
<!-- </div>--> <!-- </div>-->
<!-- <div v-else>--> <!-- <div v-else>-->
<!-- <van-field is-link readonly v-model="borrowTime" label="借用日期" @click="showPicker = true"--> <!-- <van-field is-link readonly v-model="borrowTime" label="借用日期" @click="showPicker = true"-->
<!-- placeholder="请选择借用日期"/>--> <!-- placeholder="请选择借用日期"/>-->
<!-- <van-calendar :readonly="queryId ? true : false" v-model:show="showPicker" @confirm="onConfirmBorrowTime"/>--> <!-- <van-calendar :readonly="queryId ? true : false" v-model:show="showPicker" @confirm="onConfirmBorrowTime"/>-->
<!-- </div>--> <!-- </div>-->
<!-- <div v-if="queryId">--> <!-- <div v-if="queryId">-->
<van-field readonly v-model="returnForm.returnTime" label="归还日期"/> <van-field readonly v-model="returnForm.returnTime" label="归还日期"/>
<!-- </div>--> <!-- </div>-->
<van-field readonly v-model="returnForm.deadline" label="借用期限" <van-field readonly v-model="returnForm.deadline" label="借用期限"
placeholder="请输入借用期限"/> placeholder="请输入借用期限"/>
<van-field :readonly="queryId ? true : false" v-model="returnForm.returnEquipmentCondition" label="归还时设备情况"/> <van-field :readonly="queryId ? true : false" v-model="returnForm.returnEquipmentCondition" label="归还时设备情况"/>
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
<script setup> <script setup>
import moment from 'moment'; import moment from 'moment';
import { returnEquipment, getEquipmentDetail } from "@/service/schoolProperty" import {returnEquipment, getEquipmentDetail} from "@/service/schoolProperty"
import {reactive, ref, onMounted} from "vue"; import {reactive, ref, onMounted} from "vue";
import {useRoute, useRouter} from "vue-router"; import {useRoute, useRouter} from "vue-router";
import {Dialog, Toast} from "vant"; import {Dialog, Toast} from "vant";
...@@ -49,7 +49,7 @@ const router = useRouter(); ...@@ -49,7 +49,7 @@ const router = useRouter();
const route = useRoute(); const route = useRoute();
const queryId = route.query.id; const queryId = route.query.id;
const queryEncode = route.query.encode; const queryEncode = route.query.encode;
console.log('queryEncode',queryEncode) console.log('queryEncode', queryEncode)
const store = useStore() const store = useStore()
const userName = store.state.userInfo.teacherName const userName = store.state.userInfo.teacherName
const userId = store.state.userInfo.userId const userId = store.state.userInfo.userId
...@@ -59,48 +59,61 @@ let returnForm = reactive({ // 表单数据 ...@@ -59,48 +59,61 @@ let returnForm = reactive({ // 表单数据
encode: '', //自编码 encode: '', //自编码
equipmentName: '', //设备名称 equipmentName: '', //设备名称
model: '', //型号 model: '', //型号
borrowTime:'', // 借用日期 borrowTime: '', // 借用日期
borrowBy: '', //借用人 borrowBy: '', //借用人
purpose: '', //用途 purpose: '', //用途
deadline:'', //借用期限(天) deadline: '', //借用期限(天)
returnTime: '', //归还日期 returnTime: '', //归还日期
returnEquipmentCondition: '', //归还时设备情况 returnEquipmentCondition: '', //归还时设备情况
receivedBy:'' receivedBy: ''
}) })
onMounted(async () => { onMounted(async () => {
if (queryId) { if (queryId) {
let result = await getEquipmentDetail(queryEncode) let result = await getEquipmentDetail(queryEncode)
console.log('result', result) if(result.code == 200){
title.value = '归还情况查看' console.log('result', result)
Object.assign(returnForm, result.data) title.value = '归还情况查看'
returnForm.borrowTime = result.data.borrowTime Object.assign(returnForm, result.data)
returnForm.returnTime = result.data.returnTime returnForm.borrowTime = result.data.borrowTime
returnForm.deadline = returnForm.returnTime - returnForm.borrowTime returnForm.returnTime = result.data.returnTime
returnForm.deadline = returnForm.returnTime - returnForm.borrowTime
}
} else { } else {
title.value = '物品归还' title.value = '物品归还'
let equipmentRes = await getEquipmentDetail(queryEncode) let equipmentRes = await getEquipmentDetail(queryEncode)
console.log('equipmentRes',equipmentRes.data) if (equipmentRes.code == 3000) {
console.log('returnForm',returnForm)
Object.assign(returnForm,equipmentRes.data)
returnForm.receivedBy = userName
returnForm.returnTime = formatDatetime(new Date())
// const date1 = moment(returnForm.returnTime).format('YYYY/MM/DD HH:mm:ss')
const newDay = moment(returnForm.returnTime).diff(moment(returnForm.borrowTime),'days')
if(newDay == 0){
const minute = moment(returnForm.returnTime).diff(moment(returnForm.borrowTime),'minute')
returnForm.deadline = Math.floor(minute/60) + '小时'
}else{
returnForm.deadline = moment(returnForm.returnTime).diff(moment(returnForm.borrowTime),'days') + '天'
}
if(equipmentRes.data.isLend == '0'){
//未借出 只会返回设备那3个基本信息
Dialog.alert({ Dialog.alert({
title: '提示', title: '提示',
message: '该设备未借出，无需归还', message: equipmentRes.msg,
}).then(() => { }).then(() => {
router.back(); router.back();
}); });
} }
if (equipmentRes.code == 200) {
console.log('equipmentRes', equipmentRes.data)
console.log('returnForm', returnForm)
Object.assign(returnForm, equipmentRes.data)
returnForm.receivedBy = userName
returnForm.returnTime = formatDatetime(new Date())
// const date1 = moment(returnForm.returnTime).format('YYYY/MM/DD HH:mm:ss')
const newDay = moment(returnForm.returnTime).diff(moment(returnForm.borrowTime), 'days')
if (newDay == 0) {
const minute = moment(returnForm.returnTime).diff(moment(returnForm.borrowTime), 'minute')
returnForm.deadline = Math.floor(minute / 60) + '小时'
} else {
returnForm.deadline = moment(returnForm.returnTime).diff(moment(returnForm.borrowTime), 'days') + '天'
}
if (equipmentRes.data.isLend == '0') {
//未借出 只会返回设备那3个基本信息
Dialog.alert({
title: '提示',
message: '该设备未借出，无需归还',
}).then(() => {
router.back();
});
}
}
} }
}); });
//借用日期确认 //借用日期确认
...@@ -119,20 +132,20 @@ const goback = () => { ...@@ -119,20 +132,20 @@ const goback = () => {
//表单提交 //表单提交
const onSubmit = async () => { const onSubmit = async () => {
console.log('submit returnForm',returnForm) console.log('submit returnForm', returnForm)
const params = { const params = {
id:returnForm.id, id: returnForm.id,
returnTime:returnForm.returnTime, returnTime: returnForm.returnTime,
returnEquipmentCondition:returnForm.returnEquipmentCondition, returnEquipmentCondition: returnForm.returnEquipmentCondition,
remark:returnForm.remark, remark: returnForm.remark,
receivedById:userId, receivedById: userId,
receivedBy:userName, receivedBy: userName,
equipmentId:returnForm.equipmentId equipmentId: returnForm.equipmentId
} }
console.log('params',params) console.log('params', params)
let result = await returnEquipment(params) let result = await returnEquipment(params)
console.log('result',result) console.log('result', result)
if(result.code == 200){ if (result.code == 200) {
router.back(); router.back();
Toast("归还成功"); Toast("归还成功");
} }
......
src/views/teacher/schoolProperty/returnList.vue
<template> <template>
<van-nav-bar title="归还管理" left-text="返回" left-arrow @click-left="goback"></van-nav-bar> <van-nav-bar title="归还管理" left-text="返回" left-arrow @click-left="goback"></van-nav-bar>
<div class="flexBLock searchBlock"> <div class="flexBLock searchBlock">
<van-search class="searchInput" @search="onSearch" v-model="searchKey" placeholder="请输入搜索关键词" /> <van-search class="searchInput" @search="onSearch" v-model="searchKey" placeholder="请输入设备名称" />
<van-icon name="scan" @click="getCode" /> <van-icon name="scan" @click="getCode" />
</div> </div>
<van-pull-refresh v-model="pullLoading" @refresh="onRefresh"> <van-pull-refresh v-model="pullLoading" @refresh="onRefresh">
......
src/views/teacher/schoolProperty/useAdd.vue
...@@ -43,6 +43,14 @@ const dateChoose = ref('') ...@@ -43,6 +43,14 @@ const dateChoose = ref('')
let showPicker = ref(false) //是否显示日历选择 let showPicker = ref(false) //是否显示日历选择
onMounted(async () => { onMounted(async () => {
let equipmentRes = await scanEquipmentInfo(queryEncode) let equipmentRes = await scanEquipmentInfo(queryEncode)
if (equipmentRes.code == 3000) {
Dialog.alert({
title: '提示',
message: equipmentRes.msg,
}).then(() => {
router.back();
});
}
console.log('equipmentRes',equipmentRes) console.log('equipmentRes',equipmentRes)
if(equipmentRes.code == 200){ if(equipmentRes.code == 200){
Object.assign(useForm,equipmentRes.data) Object.assign(useForm,equipmentRes.data)
......
src/views/teacher/schoolProperty/useList.vue
<template> <template>
<van-nav-bar title="物品领用" left-text="返回" left-arrow @click-left="goback"></van-nav-bar> <van-nav-bar title="物品领用" left-text="返回" left-arrow @click-left="goback"></van-nav-bar>
<div class="flexBLock searchBlock"> <div class="flexBLock searchBlock">
<van-search class="searchInput" @search="onSearch" v-model="searchKey" placeholder="请输入搜索关键词" /> <van-search class="searchInput" @search="onSearch" v-model="searchKey" placeholder="请输入设备名称" />
<van-icon @click="getCode" name="scan" /> <van-icon @click="getCode" name="scan" />
</div> </div>
<van-pull-refresh v-model="pullLoading" @refresh="onRefresh"> <van-pull-refresh v-model="pullLoading" @refresh="onRefresh">
......
unused-files.json
[ [
"/Users/ths/WebstormProjects/二中/公众号/zhxy/src/assets/icon/competition.png",
"/Users/ths/WebstormProjects/二中/公众号/zhxy/src/assets/index/home.jpg", "/Users/ths/WebstormProjects/二中/公众号/zhxy/src/assets/index/home.jpg",
"/Users/ths/WebstormProjects/二中/公众号/zhxy/src/assets/index/hqbx.png", "/Users/ths/WebstormProjects/二中/公众号/zhxy/src/assets/index/hqbx.png",
"/Users/ths/WebstormProjects/二中/公众号/zhxy/src/assets/login/loginback.png",
"/Users/ths/WebstormProjects/二中/公众号/zhxy/src/assets/ttf/x.ttf", "/Users/ths/WebstormProjects/二中/公众号/zhxy/src/assets/ttf/x.ttf",
"/Users/ths/WebstormProjects/二中/公众号/zhxy/src/assets/xxcjx.png", "/Users/ths/WebstormProjects/二中/公众号/zhxy/src/assets/xxcjx.png",
"/Users/ths/WebstormProjects/二中/公众号/zhxy/src/assets/zbb.png", "/Users/ths/WebstormProjects/二中/公众号/zhxy/src/assets/zbb.png",
...@@ -10,5 +10,6 @@ ...@@ -10,5 +10,6 @@
"/Users/ths/WebstormProjects/二中/公众号/zhxy/src/utils/dict.js", "/Users/ths/WebstormProjects/二中/公众号/zhxy/src/utils/dict.js",
"/Users/ths/WebstormProjects/二中/公众号/zhxy/src/utils/MyTools.js", "/Users/ths/WebstormProjects/二中/公众号/zhxy/src/utils/MyTools.js",
"/Users/ths/WebstormProjects/二中/公众号/zhxy/src/views/tabbar/main/parent.vue", "/Users/ths/WebstormProjects/二中/公众号/zhxy/src/views/tabbar/main/parent.vue",
"/Users/ths/WebstormProjects/二中/公众号/zhxy/src/views/tabbar/main/teacher.vue" "/Users/ths/WebstormProjects/二中/公众号/zhxy/src/views/tabbar/main/teacher.vue",
"/Users/ths/WebstormProjects/二中/公众号/zhxy/src/views/teacher/laboratoryManagement/manager/applyTeacherApprove.vue"
] ]
\ No newline at end of file
vue.config.js
No preview for this file type
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment