Skip to content

N
newCSO_2023
Commit b177a562 by lizhi
Options

添加课程，菜单栏角标提醒

parent 051954a9
Showing with 124 additions and 18 deletions
src/main.js
...@@ -24,9 +24,9 @@ moment.locale("zh-cn"); ...@@ -24,9 +24,9 @@ moment.locale("zh-cn");
// Vue.prototype.Clipboard = Clipboard; // Vue.prototype.Clipboard = Clipboard;
// Vue.prototype.$UPLOAD_BASE_URL = "https://pandaxuequ.com.cn/xs/admin"; //图片上传的服务器地址 // Vue.prototype.$UPLOAD_BASE_URL = "https://pandaxuequ.com.cn/xs/admin"; //图片上传的服务器地址
// Vue.prototype.$UPLOAD_BASE_URL = "http://192.168.10.111:8085"; //图片上传的服务器地址 Vue.prototype.$UPLOAD_BASE_URL = "http://192.168.10.111:8057"; //图片上传的服务器地址
// Vue.prototype.$H5_BASE_URL = "http://192.168.10.108:8081/#/"; //H5服务器地址 // Vue.prototype.$H5_BASE_URL = "http://192.168.10.108:8081/#/"; //H5服务器地址
Vue.prototype.$UPLOAD_BASE_URL = "http://test.csasedu.com:10032"; //图片上传的服务器地址 // Vue.prototype.$UPLOAD_BASE_URL = "http://test.csasedu.com:10032"; //图片上传的服务器地址
Vue.prototype.$H5_BASE_URL = "http://test.csasedu.com:10034/#/"; //H5跳转的网页地址 Vue.prototype.$H5_BASE_URL = "http://test.csasedu.com:10034/#/"; //H5跳转的网页地址
Vue.use(ElementUI, { locale }); Vue.use(ElementUI, { locale });
......
src/store/getters.js
...@@ -11,6 +11,7 @@ const getters = { ...@@ -11,6 +11,7 @@ const getters = {
xfSelectUnBind: state => state.user.xfSelectUnBind, xfSelectUnBind: state => state.user.xfSelectUnBind,
cooperateSchoolAll: state => state.user.cooperateSchoolAll, cooperateSchoolAll: state => state.user.cooperateSchoolAll,
recruitSchoolAll: state => state.user.recruitSchoolAll, recruitSchoolAll: state => state.user.recruitSchoolAll,
outlineListUnconfirm: state => state.user.outlineListUnconfirm,
addRouters: state => state.permission.addRouters, addRouters: state => state.permission.addRouters,
routers: state => state.permission.routers routers: state => state.permission.routers
}; };
......
src/store/modules/user.js
...@@ -12,7 +12,8 @@ const user = { ...@@ -12,7 +12,8 @@ const user = {
kfSelectUnBind: "", kfSelectUnBind: "",
xfSelectUnBind: "", xfSelectUnBind: "",
cooperateSchoolAll: "", cooperateSchoolAll: "",
recruitSchoolAll: "" recruitSchoolAll: "",
outlineListUnconfirm: ""
}, },
mutations: { mutations: {
...@@ -45,6 +46,9 @@ const user = { ...@@ -45,6 +46,9 @@ const user = {
}, },
set_recruitSchoolAll: (state, recruitSchoolAll) => { set_recruitSchoolAll: (state, recruitSchoolAll) => {
state.recruitSchoolAll = recruitSchoolAll; state.recruitSchoolAll = recruitSchoolAll;
},
set_outlineListUnconfirm: (state, outlineListUnconfirm) => {
state.outlineListUnconfirm = outlineListUnconfirm;
} }
}, },
......
src/views/dailyTask/editPlan.vue
...@@ -81,7 +81,9 @@ ...@@ -81,7 +81,9 @@
align="center" align="center"
prop="addTime" prop="addTime"
> >
<template slot-scope="scope">{{ scope.row.addTime }}</template> <template slot-scope="scope">{{
scope.row.addTime | formatDateTime
}}</template>
</el-table-column> </el-table-column>
<el-table-column label="大纲进度" align="center"> <el-table-column label="大纲进度" align="center">
......
src/views/layout/components/Sidebar/SidebarItem.vue
...@@ -21,8 +21,17 @@ ...@@ -21,8 +21,17 @@
<span <span
v-if="item.children[0].meta && item.children[0].meta.title" v-if="item.children[0].meta && item.children[0].meta.title"
slot="title" slot="title"
>{{ item.children[0].meta.title }}</span >{{ item.children[0].meta.title }}
> <el-badge
v-if="
item.children[0].meta &&
item.children[0].meta.title == '课程大纲更新' &&
$store.getters.outlineListUnconfirm > 0
"
slot="title"
:value="$store.getters.outlineListUnconfirm"
></el-badge>
</span>
</el-menu-item> </el-menu-item>
</router-link> </router-link>
...@@ -126,7 +135,12 @@ ...@@ -126,7 +135,12 @@
</template> </template>
<script> <script>
import { todayTask, kfSelectUnBind, xfSelectUnBind } from "@/api/cso"; import {
todayTask,
kfSelectUnBind,
xfSelectUnBind,
outlineList
} from "@/api/cso";
import { cooperateSchoolAll, recruitSchoolAll } from "@/api/cso2"; import { cooperateSchoolAll, recruitSchoolAll } from "@/api/cso2";
export default { export default {
name: "SidebarItem", name: "SidebarItem",
...@@ -181,6 +195,14 @@ export default { ...@@ -181,6 +195,14 @@ export default {
this.$store.commit("set_recruitSchoolAll", res.data.total); this.$store.commit("set_recruitSchoolAll", res.data.total);
// console.log(res.data.total, "vuex"); // console.log(res.data.total, "vuex");
}); });
outlineList({
pageNum: 1,
pageSize: 10,
outlineState: 2
}).then(res => {
this.$store.commit("set_outlineListUnconfirm", res.data.total);
// console.log(this.$store.getters.outlineListUnconfirm, "vuex");
});
} }
}, },
mounted() { mounted() {
......
src/views/pms/product/components/courseInfo.vue
...@@ -402,7 +402,8 @@ ...@@ -402,7 +402,8 @@
prop="auditSchool" prop="auditSchool"
:label-width="formLabelWidth" :label-width="formLabelWidth"
> >
<el-input v-model="list.auditSchool" clearable> </el-input> <el-input @change="test" v-model="list.auditSchool" clearable>
</el-input>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
label="审课学姐" label="审课学姐"
...@@ -423,26 +424,29 @@ ...@@ -423,26 +424,29 @@
<div v-for="(item, index) in num" :key="index" class="line2"> <div v-for="(item, index) in num" :key="index" class="line2">
<div>{{ "选课" + item }}</div> <div>{{ "选课" + item }}</div>
<div class="line"> <div class="line">
<el-col :span="6"> <el-col :span="8">
<el-form-item label="年份" required :label-width="formLabelWidth"> <el-form-item label="年份" required label-width="150px">
<el-input v-model="list.userCourseList[index].yearTime"> <el-input v-model="list.userCourseList[index].yearTime">
<!-- <template slot="append">年</template> --> <!-- <template slot="append">年</template> -->
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="8">
<el-form-item label="学期" required :label-width="formLabelWidth"> <el-form-item label="学期" required label-width="150px">
<el-input v-model="list.userCourseList[index].term"> <el-input v-model="list.userCourseList[index].term">
<!-- <template slot="append">学期</template> --> <!-- <template slot="append">学期</template> -->
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</div>
<el-col :span="6"> <div class="line">
<el-col :span="8">
<el-form-item label="cso课程代码" label-width="150px"> <el-form-item label="cso课程代码" label-width="150px">
<el-select <el-select
v-model="list.userCourseList[index].csoCourseCode" v-model="list.userCourseList[index].csoCourseCode"
clearable clearable
filterable
:disabled=" :disabled="
list.userCourseList[index].ownCourseCode || list.userCourseList[index].ownCourseCode ||
list.userCourseList[index].auditCourseCode list.userCourseList[index].auditCourseCode
...@@ -459,15 +463,23 @@ ...@@ -459,15 +463,23 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- <el-form-item label="课程名称" :label-width="formLabelWidth">
<!-- <el-form-item label="cso课程名称" :label-width="formLabelWidth">
<el-input v-model="list.userCourseList[index].courseName"> <el-input v-model="list.userCourseList[index].courseName">
</el-input> </el-input>
</el-form-item> --> </el-form-item> -->
</el-col> </el-col>
<el-col :span="8">
<el-form-item label="cso课程名称" label-width="150px">
<el-input v-model="list.userCourseList[index].courseName">
</el-input>
</el-form-item>
</el-col>
</div> </div>
<div class="line"> <div class="line">
<el-col :span="8"> <!-- <el-col :span="8"> -->
<!-- <el-form-item label="所在学校课程代码" label-width="150px"> <!-- <el-form-item label="所在学校课程代码" label-width="150px">
<el-input <el-input
v-model="list.userCourseList[index].ownCourseCode" v-model="list.userCourseList[index].ownCourseCode"
...@@ -481,11 +493,11 @@ ...@@ -481,11 +493,11 @@
</el-input> </el-input>
</el-form-item> --> </el-form-item> -->
<el-form-item label="课程名称" :label-width="formLabelWidth"> <!-- <el-form-item label="课程名称" :label-width="formLabelWidth">
<el-input v-model="list.userCourseList[index].courseName"> <el-input v-model="list.userCourseList[index].courseName">
</el-input> </el-input>
</el-form-item> </el-form-item> -->
</el-col> <!-- </el-col> -->
<el-col :span="8"> <el-col :span="8">
<!-- <el-form-item label="cso课程代码" label-width="150px"> <!-- <el-form-item label="cso课程代码" label-width="150px">
...@@ -524,6 +536,21 @@ ...@@ -524,6 +536,21 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="所在学校课程名称" label-width="150px">
<el-input
v-model="list.userCourseList[index].ownCourseCode"
:disabled="
list.userCourseList[index].csoCourseCode ||
list.userCourseList[index].auditCourseCode
? true
: false
"
>
</el-input>
</el-form-item>
</el-col>
<!-- <el-col :span="8">
<el-form-item label="审课大学课程代码" label-width="150px"> <el-form-item label="审课大学课程代码" label-width="150px">
<el-input <el-input
v-model="list.userCourseList[index].auditCourseCode" v-model="list.userCourseList[index].auditCourseCode"
...@@ -536,7 +563,54 @@ ...@@ -536,7 +563,54 @@
> >
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> -->
</div>
<div class="line">
<el-col :span="8">
<el-form-item label="审课学校课程代码" label-width="150px">
<el-input
v-model="list.userCourseList[index].ownCourseCode"
:disabled="
list.userCourseList[index].csoCourseCode ||
list.userCourseList[index].auditCourseCode
? true
: false
"
>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="审课学校课程名称" label-width="150px">
<el-input
v-model="list.userCourseList[index].ownCourseCode"
:disabled="
list.userCourseList[index].csoCourseCode ||
list.userCourseList[index].auditCourseCode
? true
: false
"
>
</el-input>
</el-form-item>
</el-col> </el-col>
<!-- <el-col :span="8">
<el-form-item label="审课大学课程代码" label-width="150px">
<el-input
v-model="list.userCourseList[index].auditCourseCode"
:disabled="
list.userCourseList[index].ownCourseCode ||
list.userCourseList[index].csoCourseCode
? true
: false
"
>
</el-input>
</el-form-item>
</el-col> -->
</div> </div>
<el-divider></el-divider> <el-divider></el-divider>
</div> </div>
...@@ -632,6 +706,9 @@ export default { ...@@ -632,6 +706,9 @@ export default {
} }
}, },
methods: { methods: {
test(val) {
console.log(val, "val");
},
submitForm(formName) { submitForm(formName) {
// console.log(this.list, "submitForm"); // console.log(this.list, "submitForm");
this.list.userId = this.$route.query.id; this.list.userId = this.$route.query.id;
......
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