Skip to content

D
dd_school
Commit 8c2b5c48 by zhaopanyu
Options

zpy 修改部分问题

parent 9963963b
Showing with 192 additions and 290 deletions
ruoyi-ui/src/views/components/moduleComponets/TeacherSelect/index.vue
<template>
<el-dialog
width="960px"
:visible.sync="open"
:title="title"
@close="handleClose"
>
<el-dialog width="960px" :visible.sync="open" :title="title" @close="handleClose">
<el-form ref="queryForm" inline :model="queryForm">
<!--<el-form-item label="工作编号" prop="teacherCode">-->
<!-- <el-input-->
......@@ -16,20 +11,10 @@
<!--</el-form-item>-->
<el-form-item label="教师姓名" prop="teacherName">
<el-input
v-model="queryForm.teacherName"
placeholder="请输入老师名称"
clearable
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryForm.teacherName" placeholder="请输入老师名称" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="教师电话" prop="teacherTel">
<el-input
v-model="queryForm.teacherTel"
placeholder="请输入老师电话"
clearable
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryForm.teacherTel" placeholder="请输入老师电话" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item>
......@@ -37,16 +22,8 @@
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-table
ref="teacherTable"
v-loading="loading"
stripe
height="380px"
width="100%"
:data="teacherList"
@selection-change="handleSelectChange"
@row-click="handleRowClick"
>
<el-table ref="teacherTable" v-loading="loading" stripe height="380px" width="100%" :data="teacherList"
@selection-change="handleSelectChange" @row-click="handleRowClick">
<el-table-column type="selection" align="center"></el-table-column>
<!--<el-table-column type="index" label="序号" width="55" align="center"></el-table-column>-->
<!--<el-table-column label="工作编号" align="center" prop="teacherCode"/>-->
......@@ -56,43 +33,33 @@
<ListImage :image-url="isEmptyTeacherUrl(scope.row.picUrl, scope.row.sex)"></ListImage>
</template>
</el-table-column>
<el-table-column label="老师名称" align="center" prop="teacherName" width="120" show-overflow-tooltip/>
<el-table-column label="老师名称" align="center" prop="teacherName" width="120" show-overflow-tooltip />
<el-table-column label="性别" align="center" prop="sex" width="80">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex"/>
<dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex" />
</template>
</el-table-column>
<el-table-column label="老师电话" width="160" align="center" prop="teacherTel"/>
<el-table-column label="家庭住址" align="center" prop="homeAddress" show-overflow-tooltip/>
<!--<el-table-column label="身份证号" width="180" align="center" prop="idCard"/>-->
<el-table-column label="老师电话" width="160" align="center" prop="teacherTel" />
<el-table-column label="职工类型" width="160" align="center" prop="employeeType" />
<el-table-column label="部门" width="160" align="center" prop="deptName" />
<!-- <el-table-column label="家庭住址" align="center" prop="homeAddress" show-overflow-tooltip/>
<el-table-column label="身份证号" width="180" align="center" prop="idCard"/> -->
</el-table>
<ExPagination
v-show="total > 0"
:total="total"
:page.sync="queryForm.pageNum"
:limit.sync="queryForm.pageSize"
@pagination="getList"
></ExPagination>
<ExPagination v-show="total > 0" :total="total" :page.sync="queryForm.pageNum" :limit.sync="queryForm.pageSize"
@pagination="getList"></ExPagination>
<div slot="footer">
<el-button
type="primary"
size="small"
:disabled="!isSimple"
@click="handleSelect">确 定
<el-button type="primary" size="small" :disabled="!isSimple" @click="handleSelect">确 定
</el-button>
<el-button
plain
size="small"
@click="handleClose">取 消
<el-button plain size="small" @click="handleClose">取 消
</el-button>
</div>
</el-dialog>
</template>
<script>
import {listInform} from "@/api/smartSchool/teacherManage/teacherInformation.js";
import { listInform } from "@/api/smartSchool/teacherManage/teacherInformation.js";
import ListImage from "@/components/ListImage";
import {Gender} from "../../../../enums/common";
import { Gender } from "../../../../enums/common";
export default {
name: "TeacherSelect",
......
ruoyi-ui/src/views/smartSchool/indexMould/myTask/depBudgetapproval/index.vue
......@@ -119,6 +119,7 @@ export default {
this.isTaskListe = true
departiDetail().then((response) => {
this.tableData = response.rows
console.log('this.tableData', this.tableData);
this.total = response.total
this.loading = false
});
......
ruoyi-ui/src/views/smartSchool/officialWork/budgetFilling/index.vue
......@@ -15,13 +15,12 @@
<!-- 表格数据 -->
<el-table border v-loading="loading" :row-style="{ height: '35px' }" :cell-style="{ padding: '0' }"
:data="budgetList" style="font-size: 14px" stripe>
<el-table-column label="年度" prop="year" align="center" width="100px" />
<el-table-column label="年度" prop="year" align="center" />
<el-table-column label="科室" prop="deptName" align="center" />
<el-table-column label="填报人" prop="informant" align="center" width="150px" />
<el-table-column label="分管领导" prop="leadershipName" align="center" width="150px" />
<el-table-column label="备注" prop="remark" align="center" />
<el-table-column label="填报时间" prop="tbTime" align="center" width="200px" />
<el-table-column label="当前任务" prop="state" align="center" width="250px">
<el-table-column label="填报人" prop="informant" align="center" />
<el-table-column label="分管领导" prop="leadershipName" align="center" />
<el-table-column label="填报时间" prop="tbTime" align="center" />
<el-table-column label="当前任务" prop="state" align="center">
<template slot-scope="{ row }">
{{ row.state === '0' ? "未提交" :
row.state === '1' ? "分管领导审核" :
......@@ -139,17 +138,15 @@
{{ postForm.informant }}
</span>
</el-col>
<el-col :span="10">
<!-- <el-form-item label="分管领导" prop="handUserName2"> -->
<!-- <el-input :value="postForm.handUserName2" placeholder="请选择分管领导"
@focus="openSelect('选择分管领导', 'leaderList', 2)"></el-input> -->
<span class="uploadname" style="font-size: 16px;font-weight: bold;">分管领导:
<span style="display: inline-block; width: 100px;height: 20px;"
@click="openSelect('选择分管领导', 'leaderList', 2)">{{ postForm.handUserName2 }}
</span>
</span>
<!-- </el-form-item> -->
<el-form-item label="分管领导:"
style="display: flex; align-items: center; font-size: 16px; font-weight: bold;">
<el-input v-model="postForm.handUserName2" placeholder="请选择分管领导"
@focus="openSelect('选择分管领导', 'leaderList', 2)" style="margin-left: 10px;"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-dialog>
......@@ -545,23 +542,36 @@ export default {
type: 'warning'
})
.then(() => {
submitApply(row.id).then(res => {
if (res.code == 200) {
this.$message({
type: 'success',
message: '提交成功!'
})
this.getList()
}
})
const loadingInstance = this.$loading({
lock: true,
text: '正在提交数据，请稍等...',
background: 'rgba(0, 0, 0, 0.7)'
}); // 显示遮罩层
submitApply(row.id)
.then(res => {
if (res.code == 200) {
this.$message({
type: 'success',
message: '提交成功!'
});
loadingInstance.close(); // 请求完成后关闭遮罩层
this.getList();
}
})
.catch(() => {
this.$message.error('提交失败，请重试!');
loadingInstance.close(); // 请求失败时也关闭遮罩层
});
})
.catch(() => {
this.$message({
type: 'info',
message: '已取消提交'
})
})
});
});
},
// 查看按钮
handleLook(row) {
queryDepart(row.id).then(response => {
......@@ -599,7 +609,7 @@ export default {
this.open = true;
this.postForm.informant = this.$store.state.user.name;
this.title = '新增预算批复信息'
this.title = '新增预算申请信息'
},
// 删除按钮操作
......
ruoyi-ui/src/views/smartSchool/personWork/auditoriumReservation/index.vue
......@@ -114,7 +114,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="预计时长" prop="duration">
<el-input type="number" v-model="postForm.duration" placeholder="请输入"></el-input>
<el-input v-model="postForm.duration" placeholder="请输入"></el-input>
</el-form-item>
</el-col>
</el-row>
......
ruoyi-ui/src/views/smartSchool/personWork/recordingroomAppointment/IdleSituation/index.vue
......@@ -11,15 +11,14 @@
</el-date-picker>
</el-form-item>
<el-form-item prop="studioName" :rules="[{ required: true, message: '请选择录播室', trigger: 'change,blur' }]">
<el-select v-model="queryParams.studioId" placeholder="录播室">
<el-select @change="changeStudio" v-model="queryParams.studioId" placeholder="录播室">
<el-option v-for="item in options" :key="item.id" :label="item.studioName" :value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-button size="mini" type="primary" icon="el-icon-search" @click="fetchData">搜索</el-button>
<el-button size="mini" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
<!-- <el-button size="mini" type="primary" icon="el-icon-search" @click="fetchData">搜索</el-button> -->
<!-- :disabled="isReservationDisabled" -->
<el-button size="mini" @click="reserve">预约</el-button>
<el-button size="mini" type="primary" @click="reserve">预约</el-button>
</el-form>
<p style="margin: 0 0 0 30px;font-size: 14px">
说明：（1）录播室每天开放上午四节、下午四节、晚上三节。共计每天11节。（2）请提前一天进行预约。（3）预约不可跨天，跨天请进行多次预约</p>
......@@ -131,7 +130,7 @@ export default {
this.initTimeSlots();
// 获取录播室下拉框列表
this.getRoomList();
this.fetchStudioUseData();
// this.fetchStudioUseData();
// this.fetchData();
},
methods: {
......@@ -145,18 +144,31 @@ export default {
};
this.fetchStudioUseData(); // 重新发一次请求
},
changeStudio(value) {
console.log('value', value);
console.log('this.queryParams.startTime', this.queryParams.startTime);
this.queryParams.studioId = value;
this.fetchStudioUseData();
},
changeDate() {
this.endTime = moment(this.queryParams.startTime).add(9, 'days')
// this.fetchData();
this.initDays();
this.fetchStudioUseData();
},
// 查询列表
fetchStudioUseData() {
this.studioUseData = []
// 调用接口获取录播室占用情况数据
console.log(123654, this.queryParams);
getstudioUse(this.queryParams.startTime, this.queryParams.studioId).then((res) => {
this.studioUseData = res.rows;
console.log(123, this.studioUseData);
});
// getstudioUse(time, id).then((res) => {
// this.studioUseData = res.rows;
// console.log(123, this.studioUseData);
// });
},
//表格占用显示
isOccupied(day, index) {
......@@ -173,7 +185,7 @@ export default {
if (this.isOccupied(day, index)) {
return false
} else {
console.log('this.selectedTimeSlots', this.selectedTimeSlots)
// console.log('this.selectedTimeSlots', this.selectedTimeSlots)
// 检查时间段是否已选中
return this.selectedTimeSlots.some((selectedSlot) => {
// console.log('selectedSlot',selectedSlot)
......@@ -224,6 +236,13 @@ export default {
getAppointmentList({}).then((res) => {
this.options = res.rows;
console.log('res', res)
if (this.options.length > 0) {
// 默认选中第一个录播室
this.queryParams.studioId = this.options[0].id;
// 立即执行搜索表单
this.fetchStudioUseData();
}
});
},
......@@ -249,6 +268,7 @@ export default {
// const startDate = new Date();
// startDate.setDate(startDate.getDate() + 1);
// console.log('startDate',startDate)
this.days = []
for (let i = 0; i < 10; i++) {
const formattedDate = moment(this.queryParams.startTime).add(i, 'days').format("YYYY-MM-DD");
console.log('formattedDate', formattedDate)
......
ruoyi-ui/src/views/smartSchool/teachAffairAdministration/affairGradeManage/gradeMemberList/index.vue
......@@ -92,7 +92,9 @@
<el-table-column label="工号" align="center" prop="teacherCode"/>
<el-table-column label="职务" align="center" prop="teacherPost"/>
<el-table-column label="电话号码" align="center" prop="teacherTel"/>
<el-table-column label="家庭住址" align="center" prop="homeAddress"/>
<el-table-column label="职务" align="center" prop="teacherPost"/>
<el-table-column label="电话号码" align="center" prop="teacherTel"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
......
ruoyi-ui/src/views/smartSchool/teachAffairAdministration/statistics/age/index.vue
<template>
<div class="app-container">
<!-- <div id="gradeEcharts" :style="{ width: '100%', height: '600px' }"></div>-->
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
<el-table
:data="tableData"
border
stripe
style="width: 100%">
<el-table-column
prop="gradeName"
label="年级"
align="center"
width="180">
<el-form :model="queryForm" ref="queryForm" size="small" :inline="true" label-width="70px">
<el-form-item label="学年" prop="classYear">
<el-date-picker v-model="queryForm.classYear" clearable type="year" value-format="yyyy" style="width: 100%"
placeholder="选择年度"></el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="gradeAgeList">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
</el-form-item>
</el-form>
<el-table :data="tableData" border stripe style="width: 100%">
<el-table-column prop="gradeName" label="年级" align="center" width="180">
</el-table-column>
<el-table-column
prop="num13"
label="13岁"
align="center"
width="180">
<el-table-column prop="num13" label="13岁" align="center" width="180">
</el-table-column>
<el-table-column
prop="num14"
label="14岁"
align="center"
width="180">
<el-table-column prop="num14" label="14岁" align="center" width="180">
</el-table-column>
<el-table-column
prop="num15"
align="center"
label="15岁">
<el-table-column prop="num15" align="center" label="15岁">
</el-table-column>
<el-table-column
prop="num16"
align="center"
label="16岁">
<el-table-column prop="num16" align="center" label="16岁">
</el-table-column>
<el-table-column
prop="num17"
align="center"
label="17岁">
<el-table-column prop="num17" align="center" label="17岁">
</el-table-column>
<el-table-column
prop="num18"
align="center"
label="18岁">
<el-table-column prop="num18" align="center" label="18岁">
</el-table-column>
<el-table-column
prop="num19"
align="center"
label="19岁">
<el-table-column prop="num19" align="center" label="19岁">
</el-table-column>
<el-table-column
prop="num20"
align="center"
label="20岁">
<el-table-column prop="num20" align="center" label="20岁">
</el-table-column>
<el-table-column
prop="num21"
align="center"
label="21岁">
<el-table-column prop="num21" align="center" label="21岁">
</el-table-column>
<el-table-column
prop="num22"
align="center"
label="22岁">
<el-table-column prop="num22" align="center" label="22岁">
</el-table-column>
</el-table>
</div>
......@@ -71,25 +40,29 @@
<script>
import * as echarts from 'echarts';
import {listGradeAge} from "@/api/smartSchool/teachAffairAdministration/ageStatistics";
import { listGradeAge } from "@/api/smartSchool/teachAffairAdministration/ageStatistics";
export default {
name: "index",
created() {
this.gradeAgeList()
this.gradeAgeList();
this.getNowYear();
},
mounted() {
// console.log(echarts, 'create')
// // 基于准备好的dom，初始化echarts实例
// let myChart = echarts.init(document.getElementById('gradeEcharts'));
// // 绘制图表
// myChart.setOption(this.gradeData);
// window.addEventListener("resize", function () {
// myChart.resize()
// })
// console.log(echarts, 'create')
// // 基于准备好的dom，初始化echarts实例
// let myChart = echarts.init(document.getElementById('gradeEcharts'));
// // 绘制图表
// myChart.setOption(this.gradeData);
// window.addEventListener("resize", function () {
// myChart.resize()
// })
},
data() {
return {
queryForm: {
classYear: '',
},
tableData: [],
gradeData: {
title: {
......@@ -172,12 +145,23 @@ export default {
}
},
methods: {
gradeAgeList() {
listGradeAge().then((res) => {
listGradeAge(this.classYear).then((res) => {
this.tableData = res.rows
console.log('this.tableData', this.tableData);
})
},
//获得当前年份
getNowYear() {
this.classYear = new Date().getFullYear() + '';
},
// 重置按钮
resetQuery() {
this.getNowYear();
this.getList();
},
/** 【导出】按钮 */
handleExport() {
this.throttle(() => {
......@@ -188,6 +172,4 @@ export default {
}
</script>
<style scoped>
</style>
<style scoped></style>
ruoyi-ui/src/views/smartSchool/teacherManage/teacherInforManage/index.vue
......@@ -209,14 +209,14 @@
prop="teacherTel"
/>
<el-table-column
label="学历"
label="职工类型"
align="center"
prop="education"
prop="employeeType"
>
<template slot-scope="scope">
<dict-tag
:options="dict.type.education"
:value="scope.row.education"
:options="dict.type.employee_type"
:value="scope.row.employeeType"
/>
</template>
</el-table-column>
......@@ -358,15 +358,15 @@
@export="exportFile"
></ExportTable>
<!-- 添加或修改学校老师对话框 -->
<el-dialog :title="title" :visible.sync="open" width="900px" append-to-body>
<el-dialog :title="title" :visible.sync="open" width="60%" append-to-body>
<el-form
size="small"
ref="form"
:model="form"
:rules="rules"
:disabled="isDisabled"
label-width="80px"
style="width: 100%;"
label-width="120px"
>
<el-row :gutter="40">
<el-col :span="12" style="text-align: center;">
......@@ -904,6 +904,7 @@ export default {
this.loading = true;
listInform(this.queryParams).then((response) => {
this.informList = response.rows;
this.total = response.total;
this.loading = false;
});
......
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