Skip to content

D
dd_school
Commit f6809eb6 by zhaopanyu
Options

zpy 3.26

parent 9386f13d
Showing with 193 additions and 44 deletions
ruoyi-ui/src/api/smartSchool/electronicArchives/teacherAssessment.js
......@@ -8,7 +8,13 @@ export function listAssessment(query) {
params: query,
});
}
export function listAssessmentall(query) {
return request({
url: "/assessment/listAll",
method: "get",
params: query,
});
}
// 查询班主任考核详细
export function getAssessment(id) {
return request({
......
ruoyi-ui/src/assets/styles/element-ui.css 0 → 100644
.el-breadcrumb__inner,
.el-breadcrumb__inner a {
font-weight: 400 !important;
}
.el-upload input[type="file"] {
display: none !important;
}
.el-upload__input {
display: none;
}
.cell .el-tag {
margin-right: 0px;
}
.small-padding .cell {
padding-left: 5px;
padding-right: 5px;
}
.fixed-width .el-button--mini {
padding: 7px 10px;
width: 60px;
}
.status-col .cell {
padding: 0 10px;
text-align: center;
}
.status-col .cell .el-tag {
margin-right: 0px;
}
.el-dialog {
transform: none;
left: 0;
position: relative;
margin: 0 auto;
}
.upload-container .el-upload {
width: 100%;
}
.upload-container .el-upload .el-upload-dragger {
width: 100%;
height: 200px;
}
.el-dropdown-menu a {
display: block;
}
.el-range-editor.el-input__inner {
display: inline-flex !important;
}
.el-range-separator {
box-sizing: content-box;
}
.el-menu--collapse
> div
> .el-submenu
> .el-submenu__title
.el-submenu__icon-arrow {
display: none;
}
.el-input.is-disabled .el-input__inner {
color: #303133 !important;
}
ruoyi-ui/src/assets/styles/element-ui.min.css 0 → 100644
.el-breadcrumb__inner,.el-breadcrumb__inner a{font-weight:400 !important}.el-upload input[type="file"]{display:none !important}.el-upload__input{display:none}.cell .el-tag{margin-right:0px}.small-padding .cell{padding-left:5px;padding-right:5px}.fixed-width .el-button--mini{padding:7px 10px;width:60px}.status-col .cell{padding:0 10px;text-align:center}.status-col .cell .el-tag{margin-right:0px}.el-dialog{transform:none;left:0;position:relative;margin:0 auto}.upload-container .el-upload{width:100%}.upload-container .el-upload .el-upload-dragger{width:100%;height:200px}.el-dropdown-menu a{display:block}.el-range-editor.el-input__inner{display:inline-flex !important}.el-range-separator{box-sizing:content-box}.el-menu--collapse>div>.el-submenu>.el-submenu__title .el-submenu__icon-arrow{display:none}.el-input.is-disabled .el-input__inner{color:#303133 !important}
ruoyi-ui/src/assets/styles/element-ui.scss
......@@ -91,3 +91,8 @@
.el-submenu__icon-arrow {
display: none;
}
.el-input.is-disabled{
.el-input__inner{
color: #303133 !important;
}
}
ruoyi-ui/src/assets/styles/index.scss
......@@ -205,3 +205,7 @@ aside {
.selectWidth {
width: 100%!important;
}
::v-deep .el-input.is-disabled .el-input__inner{
color: #303133 !important;
}
ruoyi-ui/src/utils/request.js
......@@ -7,11 +7,10 @@ import { tansParams, blobValidate } from "@/utils/ruoyi";
import cache from "@/plugins/cache";
import { saveAs } from "file-saver";
import { timeout } from "@/enums/request";
import router from "@/router";
let downloadLoadingInstance;
// 是否显示重新登录
export let isRelogin = { show: false };
axios.defaults.headers["Content-Type"] = "application/json;charset=utf-8";
// 创建axios实例
const service = axios.create({
......@@ -20,7 +19,6 @@ const service = axios.create({
// 超时
timeout: timeout,
});
// request拦截器
service.interceptors.request.use(
(config) => {
......@@ -86,10 +84,13 @@ service.interceptors.request.use(
// 响应拦截器
service.interceptors.response.use(
(res) => {
console.log(res, "res");
// 未设置状态码则默认成功状态
const code = res.data.code || 200;
// console.log(code, "code");
// 获取错误信息
const msg = errorCode[code] || res.data.msg || errorCode["default"];
// console.log(msg, "msg");
// 二进制数据则直接返回
if (
res.request.responseType === "blob" ||
......@@ -98,8 +99,10 @@ service.interceptors.response.use(
return res.data;
}
if (code === 401) {
// router.push({ path: "/dd" });
if (!isRelogin.show) {
isRelogin.show = true;
console.log(isRelogin.show, "isRelogin.show");
MessageBox.confirm(
"登录状态已过期，您可以继续留在该页面，或者重新登录",
"系统提示",
......
ruoyi-ui/src/views/index.vue
......@@ -529,8 +529,9 @@ export default {
//从后端获取任务数量
taskNum() {
getTaskNum().then(res => {
// console.log('taskNumList', res)
console.log('taskNumList', res)
this.taskNumList = res.data
})
},
......@@ -565,6 +566,7 @@ export default {
getWeatherData() {
getWeather().then(res => {
// log('getWeatherData', res)
this.weatherData = JSON.parse(JSON.stringify(res.weather))
this.user = JSON.parse(JSON.stringify(res.user))
this.user.loginDate = new Date(this.user.loginDate).toLocaleString()
......
ruoyi-ui/src/views/login.vue
......@@ -139,7 +139,10 @@ export default {
// 获取code
getCode() {
dd.getAuthCode({
corpId: 'dingaa3937ff8b7dd267f2c783f7214b6d69',
//测试
// corpId: 'dingaa3937ff8b7dd267f2c783f7214b6d69',
//正式
corpId: 'dingccea40788226c988f2c783f7214b6d69',
success: (res) => {
console.log('获取新的免登码成功', res);
const code = res.code
......@@ -159,7 +162,6 @@ export default {
// 获取token
getToken(code) {
getCode(code).then(res => {
console.log('res', res);
if (res) {
setToken(res)
this.$store.commit('SET_TOKEN', res)
......
ruoyi-ui/src/views/smartSchool/awardsDisciplinary/schoolAwards/awardEntry/index.vue
......@@ -66,7 +66,11 @@
<div>{{ selectDictLabel(dict.type.audit_state, row.auditState) }}</div>
</template>
</el-table-column>
<el-table-column align="center" prop="remark" label="备注" width="150" show-overflow-tooltip />
<el-table-column align="center" prop="remark" label="公布形式" width="120" show-overflow-tooltip>
<template slot-scope="{ row }">
<div>{{ selectDictLabel(dict.type.announcement, row.remark) }}</div>
</template>
</el-table-column>
<el-table-column align="center" fixed="right" label="操作" width="200">
<template slot-scope="scope">
<div>
......@@ -161,9 +165,11 @@
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入" clearable type="textarea" :rows="2"
:style="{ width: '100%' }"></el-input>
<el-form-item label="公布形式" prop="remark">
<el-select v-model="form.remark" placeholder="请选择" clearable style="width: 100%;">
<el-option v-for="dict in dict.type.announcement" :key="dict.value" :label="dict.label"
:value="dict.value" />
</el-select>
</el-form-item>
</el-col>
</el-row>
......@@ -264,9 +270,11 @@
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入" clearable type="textarea" :rows="2"
:style="{ width: '100%' }"></el-input>
<el-form-item label="公布形式" prop="remark">
<el-select v-model="form.remark" placeholder="请选择" clearable style="width: 100%;">
<el-option v-for="dict in dict.type.announcement" :key="dict.value" :label="dict.label"
:value="dict.value" />
</el-select>
</el-form-item>
</el-col>
</el-row>
......@@ -318,7 +326,7 @@ import picAvatar from '@/views/smartSchool/schoolManage/introduce/schoolInfo/pro
export default {
name: 'index',
components: { Treeselect, picAvatar },
dicts: ['awards_type', 'awards_level', 'audit_state'],
dicts: ['awards_type', 'awards_level', 'audit_state', 'announcement'],
data() {
return {
isEdit: false,
......@@ -385,6 +393,9 @@ export default {
schoolAccessoryList: [
{ required: true, message: "证书照片不能为空", trigger: "change" }
],
remark: [
{ required: true, message: "公布形式不能为空", trigger: "change" }
],
},
//弹窗
......
ruoyi-ui/src/views/smartSchool/awardsDisciplinary/schoolAwards/awardManagement/index.vue
......@@ -400,6 +400,9 @@ export default {
schoolAccessoryList: [
{ required: true, message: "证书照片不能为空", trigger: "change" }
],
remark: [
{ required: true, message: "公布形式不能为空", trigger: "change" }
],
},
//弹窗
......
ruoyi-ui/src/views/smartSchool/awardsDisciplinary/schoolAwards/awardReview/index.vue
......@@ -63,7 +63,11 @@
<div>{{ selectDictLabel(dict.type.audit_state, row.auditState) }}</div>
</template>
</el-table-column>
<el-table-column align="center" prop="remark" label="备注" width="150" show-overflow-tooltip />
<el-table-column align="center" prop="remark" label="公布形式" width="120" show-overflow-tooltip>
<template slot-scope="{ row }">
<div>{{ selectDictLabel(dict.type.announcement, row.remark) }}</div>
</template>
</el-table-column>
<el-table-column align="center" fixed="right" label="操作" width="150">
<template slot-scope="scope">
<div>
......@@ -146,9 +150,11 @@
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入" clearable type="textarea" :rows="2"
:style="{ width: '100%' }"></el-input>
<el-form-item label="公布形式" prop="remark">
<el-select v-model="form.remark" placeholder="请选择" clearable style="width: 100%;">
<el-option v-for="dict in dict.type.announcement" :key="dict.value" :label="dict.label"
:value="dict.value" />
</el-select>
</el-form-item>
</el-col>
</el-row>
......@@ -200,7 +206,7 @@ import { InsertDropdownListsHeaders } from '@alicloud/dingtalk/dist/doc_1_0/clie
export default {
name: 'index',
components: { Treeselect, picAvatar },
dicts: ['awards_type', 'awards_level', 'audit_state'],
dicts: ['awards_type', 'awards_level', 'audit_state', 'announcement'],
data() {
return {
uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址
......@@ -267,6 +273,9 @@ export default {
schoolAccessoryList: [
{ required: true, message: "证书照片不能为空", trigger: "change" }
],
remark: [
{ required: true, message: "公布形式不能为空", trigger: "change" }
]
},
//弹窗
......
ruoyi-ui/src/views/smartSchool/awardsDisciplinary/studentViolation/ViolationDiscipline/index.vue
......@@ -31,7 +31,8 @@
</el-select>
</el-form-item>
<el-form-item label="班级" prop="className">
<el-input v-model="queryForm.className" placeholder="请输入" clearable @keyup.enter.native="handleQuery" />
<el-input v-model="queryForm.className" placeholder="请输入" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="班级类型">
<el-select v-model="queryForm.classType" clearable placeholder="请选择" style="width: 100%">
......@@ -53,10 +54,11 @@
<el-input v-model="queryForm.idCard" placeholder="请输入" clearable></el-input>
</el-form-item>
<el-form-item label="班主任">
<el-select v-model="queryForm.classTeacherId" placeholder="请选择" :style="{ width: '100%' }" filterable>
<el-input v-model="queryForm.classTeacher" placeholder="请输入" clearable></el-input>
<!-- <el-select v-model="queryForm.classTeacherId" placeholder="请选择" :style="{ width: '100%' }" filterable>
<el-option v-for="item in deptOptions" :key="item.userId" :label="item.userName"
:value="item.userId"></el-option>
</el-select>
</el-select> -->
</el-form-item>
<el-form-item label="违纪行为">
<el-input v-model="queryForm.violateType" placeholder="输入"></el-input>
......@@ -74,8 +76,8 @@
</el-select>
</el-form-item>
<el-form-item label="处分时间">
<el-date-picker v-model="queryForm.punishTime" type="date" value-format="yyyy-MM-dd" placeholder="请选择"
clearable style="width: 100%;">
<el-date-picker v-model="queryForm.punishTime" type="date" value-format="yyyy-MM-dd"
placeholder="请选择" clearable style="width: 100%;">
</el-date-picker>
</el-form-item>
<el-form-item class="dialog-footer" style="display: flex; justify-content: center; align-items: center">
......@@ -121,8 +123,10 @@
</template> -->
</el-table-column>
<el-table-column align="center" prop="idCard" sortable label="身份证号" width="180" show-overflow-tooltip />
<el-table-column align="center" prop="classTeacher" sortable label="班主任" width="100" show-overflow-tooltip />
<el-table-column align="center" prop="gradeDirector" sortable label="级部主任" width="100" show-overflow-tooltip />
<el-table-column align="center" prop="classTeacher" sortable label="班主任" width="100"
show-overflow-tooltip />
<el-table-column align="center" prop="gradeDirector" sortable label="级部主任" width="100"
show-overflow-tooltip />
<el-table-column align="center" prop="violateType" sortable label="违纪行为" width="120" show-overflow-tooltip>
<!-- <template slot-scope="{ row }">
<div>{{ selectDictLabel(dict.type.violate_type, row.violateType) }}</div>
......@@ -170,8 +174,8 @@
<el-col :span="8">
<el-form-item label="学期" prop="semester">
<el-select v-model="form.semester" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.semester_jsdzda" :key="dict.value" :label="dict.label"
:value="dict.value">
<el-option v-for="dict in dict.type.semester_jsdzda" :key="dict.value"
:label="dict.label" :value="dict.value">
</el-option>
</el-select>
</el-form-item>
......@@ -242,26 +246,51 @@
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="班主任" prop="classTeacherId">
<el-select v-model="form.classTeacherId" placeholder="请选择" :style="{ width: '100%' }">
<el-form-item label="班主任" prop="classTeacher">
<el-input v-model="form.classTeacher" placeholder="请输入" clearable></el-input>
<!-- <el-select v-model="form.classTeacherId" placeholder="请选择" :style="{ width: '100%' }">
<el-option v-for="item in deptOptions" :key="item.userId" :label="item.userName"
:value="item.userId"></el-option>
</el-select>
</el-select> -->
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="级部主任" prop="gradeDirectorId">
<el-select v-model="form.gradeDirectorId" placeholder="请选择" :style="{ width: '100%' }">
<el-form-item label="级部主任" prop="gradeDirector">
<el-input v-model="form.gradeDirector" placeholder="请输入" clearable></el-input>
<!-- <el-select v-model="form.gradeDirectorId" placeholder="请选择" :style="{ width: '100%' }">
<el-option v-for="item in deptOptions" :key="item.userId" :label="item.userName"
:value="item.userId"></el-option>
</el-select>
</el-select> -->
</el-form-item>
</el-col>
<el-col :span="8">
<!-- <el-col :span="8">
<el-form-item label="违纪行为">
<el-input v-model="form.violateType" placeholder="输入"></el-input>
</el-form-item>
</el-col> -->
<el-col :span="8">
<el-form-item label="违纪次数" prop="violateNum">
<el-select v-model="form.violateNum" placeholder="请选择" clearable style="width: 100%;">
<el-option v-for="dict in dict.type.violate_num" :key="dict.value" :label="dict.label"
:value="dict.value" />
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<!-- <el-form-item label="违纪行为" prop="violateType">
<el-select v-model="form.violateType" placeholder="请选择" clearable style="width: 100%;">
<el-option v-for="dict in dict.type.violate_type" :key="dict.value" :label="dict.label"
:value="dict.value" />
</el-select>
</el-form-item> -->
<el-form-item label="违纪行为" prop="violateType">
<el-input v-model="form.violateType" placeholder="输入" type="textarea"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
......@@ -283,8 +312,6 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="处分时间" prop="punishTime">
<el-date-picker v-model="form.punishTime" type="date" value-format="yyyy-MM-dd"
......@@ -294,6 +321,9 @@
</el-col>
</el-row>
<el-row>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入" clearable type="textarea"
......
ruoyi-ui/src/views/smartSchool/logisticsManage/budgetApproval/index.vue
......@@ -72,7 +72,6 @@
</div>
</template>
</el-table-column>
<el-table-column label="是否政府采购" prop="isGov" align="center">
<template slot-scope="scope">
{{ scope.row.isGov === '0' ? '是' : '否' }}
......@@ -346,7 +345,6 @@ export default {
handleLandClick(rowData) {
// 构建目标页面 URL，假设为 /detail，同时传递 rowData 中的必要参数
const detailUrl = '/detail?id=' + rowData.id; // 假设传递 id 参数
// 使用页面跳转方法，例如 Vue Router
this.$router.push(detailUrl);
},
......
ruoyi-ui/src/views/whitePage.vue
......@@ -21,18 +21,18 @@ export default {
},
created() {
// 钉钉code码，正式时打开
// this.getCode()
this.getCode()
// token,测试用
this.csToken()
// this.csToken()
},
methods: {
// 获取code
getCode() {
dd.getAuthCode({
//测试
corpId: 'dingaa3937ff8b7dd267f2c783f7214b6d69',
//corpId: 'dingaa3937ff8b7dd267f2c783f7214b6d69',
//正式
// corpId: 'dingccea40788226c988f2c783f7214b6d69',
corpId: 'dingccea40788226c988f2c783f7214b6d69',
success: (res) => {
console.log('获取新的免登码成功', res);
const code = res.code
......
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