diff --git a/README.md b/README.md index 751e961..caae598 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ # sc-edu-training-manager -四川省应急教育培训网络平台 后台管理系统前端 \ No newline at end of file +货无忧培训系统 后台管理系统前端 \ No newline at end of file diff --git a/public/index.html b/public/index.html index 9772b4e..e00bf15 100644 --- a/public/index.html +++ b/public/index.html @@ -33,7 +33,7 @@ <script src="<%= BASE_URL %>cdn/xlsx/FileSaver.min.js"></script> <script src="<%= BASE_URL %>cdn/xlsx/xlsx.full.min.js"></script> <link rel="icon" href="<%= BASE_URL %>favicon.png" /> - <title>四川省应急教育培训网络平台</title> + <title>货无忧培训系统</title> <style> html, body, diff --git a/src/config/env.js b/src/config/env.js index f05d6e3..29e8f5c 100644 --- a/src/config/env.js +++ b/src/config/env.js @@ -5,7 +5,7 @@ let baseUrl = ''; let codeUrl = `${baseUrl}/code` const env = process.env if (env.NODE_ENV === 'development') { - baseUrl = `http://nps.scqtkj.com:51490`; // 开发环境地址 + baseUrl = `192.168.2.107:8081`; // 开发环境地址 } else if (env.NODE_ENV === 'production') { baseUrl = ``; //生产环境地址 } else if (env.NODE_ENV === 'test') { diff --git a/src/config/website.js b/src/config/website.js index e50b554..e779fa1 100644 --- a/src/config/website.js +++ b/src/config/website.js @@ -13,10 +13,10 @@ export default { title: "saber", logo: "S", key: "saber", //配置主键,目前用于存储 - indexTitle: "四川省应急教育培训网络平台", + indexTitle: "货无忧培训系统", clientId: "saber", // 客户端id clientSecret: "saber_secret", // 客户端密钥 - tenantMode: true, // 是否开启租户模式 + tenantMode: false, // 是否开启租户模式 tenantId: "000000", // 管理组租户编号 captchaMode: true, // 是否开启验证码模式 switchMode: false, // 是否开启部门切换模式 diff --git a/src/lang/zh.js b/src/lang/zh.js index 7f7bcad..31031ef 100644 --- a/src/lang/zh.js +++ b/src/lang/zh.js @@ -1,5 +1,5 @@ export default { - title: "四川省应急教育培训网络平台", + title: "货无忧培训系统", logoutTip: "退出系统, 是否继续?", submitText: "确定", cancelText: "取消", @@ -78,7 +78,7 @@ export default { }, login: { title: "登录 ", - info: "四川省应急教育培训网络平台", + info: "货无忧培训系统", tenantId: "请输入租户ID", username: "请输入账号", password: "请输入密码", diff --git a/src/views/edutraining/courseCertificate.vue b/src/views/edutraining/courseCertificate.vue index e14ba6b..919c550 100644 --- a/src/views/edutraining/courseCertificate.vue +++ b/src/views/edutraining/courseCertificate.vue @@ -307,7 +307,7 @@ export default { ); }, selectionChange (list) { - return; + // return; let that = this; // this.selectionList = list; if (list.length > 1) { diff --git a/src/views/system/user.vue b/src/views/system/user.vue index 8a0e7f0..de5e080 100644 --- a/src/views/system/user.vue +++ b/src/views/system/user.vue @@ -317,12 +317,12 @@ export default { search: true, display: false, }, - { - label: "工作单位", - prop: "workPlaceName", - slot: true, - display: false, - }, + // { + // label: "工作单位", + // prop: "workPlaceName", + // slot: true, + // display: false, + // }, { label: "用户姓名", prop: "realName", @@ -381,28 +381,28 @@ export default { prop: "baseInfo", icon: "el-icon-user-solid", column: [ - { - label: "工作单位", - prop: "workPlaceId", - type: "tree", - dicUrl: "/edutraining/workplace/page", - props: { - label: "workPlaceName", - value: "workPlaceId", - }, - hide: !website.tenantMode, - addDisplay: website.tenantMode, - editDisplay: website.tenantMode, - viewDisplay: website.tenantMode, - rules: [ - { - required: true, - message: "请输入工作单位", - trigger: "click", - }, - ], - span: 24, - }, + // { + // label: "工作单位", + // prop: "workPlaceId", + // type: "tree", + // dicUrl: "/edutraining/workplace/page", + // props: { + // label: "workPlaceName", + // value: "workPlaceId", + // }, + // hide: !website.tenantMode, + // addDisplay: website.tenantMode, + // editDisplay: website.tenantMode, + // viewDisplay: website.tenantMode, + // rules: [ + // { + // required: true, + // message: "请输入工作单位", + // trigger: "click", + // }, + // ], + // span: 24, + // }, { label: "登录账号", prop: "account", @@ -635,12 +635,12 @@ export default { search: true, display: false, }, - { - label: "工作单位", - prop: "workPlaceName", - slot: true, - display: false, - }, + // { + // label: "工作单位", + // prop: "workPlaceName", + // slot: true, + // display: false, + // }, { label: "用户姓名", prop: "realName", diff --git a/vue.config.js b/vue.config.js index 3a47c3c..e7b48c7 100644 --- a/vue.config.js +++ b/vue.config.js @@ -27,7 +27,7 @@ module.exports = { '/api': { // 本地服务接口地址 // target: 'http://nps.scqtkj.com:51490/', - target: 'http://192.168.2.14:8081/', + target: 'http://127.0.0.1:8081/', //target: 'http://10.10.10.11:8088/', //远程演示服务地址,可用于直接启动项目 //target: 'https://saber.bladex.vip/api', @@ -38,7 +38,7 @@ module.exports = { }, '/': { // 本地服务接口地址 - target: 'http://nps.scqtkj.com:51490/', + target: 'http://127.0.0.1:8088/', //target: 'http://10.10.10.11:8088/', //远程演示服务地址,可用于直接启动项目 //target: 'https://saber.bladex.vip/api',