Skip to content

N
newCSO_2023
Commit 892036c5 by cmosquito
Options

修改了教务首页、请求地址、cso主管首页

parent 7f6eb1c5
Showing with 68 additions and 62 deletions
config/dev.env.js
...@@ -4,8 +4,8 @@ const prodEnv = require("./prod.env"); ...@@ -4,8 +4,8 @@ const prodEnv = require("./prod.env");
module.exports = merge(prodEnv, { module.exports = merge(prodEnv, {
NODE_ENV: '"development"', NODE_ENV: '"development"',
BASE_API: '"http://192.168.10.111:8057"' // BASE_API: '"http://192.168.10.111:8057"'
// BASE_API: '"http://8.218.108.169:8057"' BASE_API: '"http://8.218.108.169:8057"'
// BASE_API: '"http://172.31.98.241:8057"' // BASE_API: '"http://172.31.98.241:8057"'
// BASE_API: '"https://pandaxuequ.com.cn/xs/admin"' //本地系统服务器地址111 // BASE_API: '"https://pandaxuequ.com.cn/xs/admin"' //本地系统服务器地址111
// BASE_API: '"https://admin-api.macrozheng.com"', // BASE_API: '"https://admin-api.macrozheng.com"',
......
config/prod.env.js
...@@ -4,5 +4,5 @@ module.exports = { ...@@ -4,5 +4,5 @@ module.exports = {
// BASE_API: '"https://admin-api.macrozheng.com"' // BASE_API: '"https://admin-api.macrozheng.com"'
// BASE_API: '"http://test.csasedu.com:10032"' //系统服务器地址 // BASE_API: '"http://test.csasedu.com:10032"' //系统服务器地址
BASE_API: '"http://8.218.108.169:8057"' BASE_API: '"http://8.218.108.169:8057"'
// BASE_API: '"http://172.31.98.241:8057"' // BASE_API: '"http://192.168.10.111:8057"'
}; };
src/main.js
...@@ -29,7 +29,7 @@ Vue.prototype.$UPLOAD_BASE_URL = process.env.BASE_API; //图片上传的服务 ...@@ -29,7 +29,7 @@ Vue.prototype.$UPLOAD_BASE_URL = process.env.BASE_API; //图片上传的服务
// 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.prototype.$H5_BASE_URL = "http://192.168.10.114:8080/#/"; //H5跳转的网页地址 Vue.prototype.$H5_BASE_URL = "http://8.218.108.169:10034/#/"; //H5跳转的网页地址
// Vue.prototype.$H5_BASE_URL = process.env.BASE_API + "/#/"; //H5跳转的网页地址 // Vue.prototype.$H5_BASE_URL = process.env.BASE_API + "/#/"; //H5跳转的网页地址
Vue.use(ElementUI, { locale }); Vue.use(ElementUI, { locale });
......
src/router/index.js
...@@ -1264,59 +1264,59 @@ export const asyncRouterMap = [ ...@@ -1264,59 +1264,59 @@ export const asyncRouterMap = [
meta: { title: "用户列表", icon: "ums-admin" } meta: { title: "用户列表", icon: "ums-admin" }
}, },
// //权限相关页面，交付的时候不展示 // //权限相关页面，交付的时候不展示
{ // {
path: "role", // path: "role",
name: "role", // name: "role",
component: () => import("@/views/ums/role/index"), // component: () => import("@/views/ums/role/index"),
meta: { title: "角色列表", icon: "ums-role" } // meta: { title: "角色列表", icon: "ums-role" }
}, // },
{ // {
path: "allocMenu", // path: "allocMenu",
name: "allocMenu", // name: "allocMenu",
component: () => import("@/views/ums/role/allocMenu"), // component: () => import("@/views/ums/role/allocMenu"),
meta: { title: "分配菜单" }, // meta: { title: "分配菜单" },
hidden: true // hidden: true
}, // },
{ // {
path: "allocResource", // path: "allocResource",
name: "allocResource", // name: "allocResource",
component: () => import("@/views/ums/role/allocResource"), // component: () => import("@/views/ums/role/allocResource"),
meta: { title: "分配资源" }, // meta: { title: "分配资源" },
hidden: true // hidden: true
}, // },
{ // {
path: "menu", // path: "menu",
name: "menu", // name: "menu",
component: () => import("@/views/ums/menu/index"), // component: () => import("@/views/ums/menu/index"),
meta: { title: "菜单列表", icon: "ums-menu" } // meta: { title: "菜单列表", icon: "ums-menu" }
}, // },
{ // {
path: "addMenu", // path: "addMenu",
name: "addMenu", // name: "addMenu",
component: () => import("@/views/ums/menu/add"), // component: () => import("@/views/ums/menu/add"),
meta: { title: "添加菜单" }, // meta: { title: "添加菜单" },
hidden: true // hidden: true
}, // },
{ // {
path: "updateMenu", // path: "updateMenu",
name: "updateMenu", // name: "updateMenu",
component: () => import("@/views/ums/menu/update"), // component: () => import("@/views/ums/menu/update"),
meta: { title: "修改菜单" }, // meta: { title: "修改菜单" },
hidden: true // hidden: true
}, // },
{ // {
path: "resource", // path: "resource",
name: "resource", // name: "resource",
component: () => import("@/views/ums/resource/index"), // component: () => import("@/views/ums/resource/index"),
meta: { title: "资源列表", icon: "ums-resource" } // meta: { title: "资源列表", icon: "ums-resource" }
}, // },
{ // {
path: "resourceCategory", // path: "resourceCategory",
name: "resourceCategory", // name: "resourceCategory",
component: () => import("@/views/ums/resource/categoryList"), // component: () => import("@/views/ums/resource/categoryList"),
meta: { title: "资源分类" }, // meta: { title: "资源分类" },
hidden: true // hidden: true
} // }
] ]
}, },
{ path: "*", redirect: "/404", hidden: true } { path: "*", redirect: "/404", hidden: true }
......
src/views/home/index.vue
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<!-- <h1>{{ token }}</h1> --> <!-- <h1>{{ token }}</h1> -->
<csoMasterHome v-if="roles.includes('超级管理员')"></csoMasterHome> <csoMasterHome v-if="roles.includes('超级管理员')"></csoMasterHome>
<csoMasterHome v-if="roles.includes('cso主管')"></csoMasterHome> <csoMasterHome v-if="roles.includes('CSO主管')"></csoMasterHome>
<jiaowuHome v-if="roles.includes('教务老师')"></jiaowuHome> <jiaowuHome v-if="roles.includes('教务老师')"></jiaowuHome>
<kefuHome v-if="roles.includes('客服部老师')"></kefuHome> <kefuHome v-if="roles.includes('客服部老师')"></kefuHome>
<kefuHome v-if="roles.includes('客服部主管')"></kefuHome> <kefuHome v-if="roles.includes('客服部主管')"></kefuHome>
......
src/views/schoolManager/unIndependentTeach.vue
...@@ -15,8 +15,9 @@ ...@@ -15,8 +15,9 @@
title="添加非自主授课院校" title="添加非自主授课院校"
:visible.sync="noticeVisible" :visible.sync="noticeVisible"
@close="cancel('schoolTypeInfo')" @close="cancel('schoolTypeInfo')"
> >
<el-form :model="schoolTypeInfo" ref="schoolTypeInfo"> <el-form :model="schoolTypeInfo" ref="schoolTypeInfo" :rules="rules" >
<div class="line"> <div class="line">
<el-form-item label="院校名称" prop="school"> <el-form-item label="院校名称" prop="school">
<!-- <el-input v-model="noticeInfo.note"> </el-input> --> <!-- <el-input v-model="noticeInfo.note"> </el-input> -->
...@@ -48,7 +49,7 @@ ...@@ -48,7 +49,7 @@
:visible.sync="editNoticeVisible" :visible.sync="editNoticeVisible"
@close="cancel('editSchoolInfo')" @close="cancel('editSchoolInfo')"
> >
<el-form :model="editSchoolInfo" ref="editSchoolInfo"> <el-form :model="editSchoolInfo" ref="editSchoolInfo" :rules="rules">
<div class="line"> <div class="line">
<el-form-item label="院校名称" prop="school"> <el-form-item label="院校名称" prop="school">
<el-input type="textarea" autosize v-model="editSchoolInfo.school"> <el-input type="textarea" autosize v-model="editSchoolInfo.school">
...@@ -188,7 +189,11 @@ export default { ...@@ -188,7 +189,11 @@ export default {
// }, // },
updateId: "" updateId: "",
rules: {
school: [{ required: true, message: "请输入院校名称", trigger: "blur" }],
},
}; };
}, },
methods: { methods: {
......
src/views/ums/admin/index.vue
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
:model="listQuery" :model="listQuery"
size="small" size="small"
label-width="140px" label-width="140px"
@submit.native.prevent
> >
<el-form-item label="输入搜索："> <el-form-item label="输入搜索：">
<el-input <el-input
...@@ -285,7 +286,7 @@ export default { ...@@ -285,7 +286,7 @@ export default {
}; };
} }
}, },
created() { mounted() {
this.getList(); this.getList();
this.getAllRoleList(); this.getAllRoleList();
this.token = getToken(); this.token = getToken();
......
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