suzhou-jichuang-lanhai
/
jin_ji_hu
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

保留登录页，修改为动态获取

Browse Source
des
吕天方 10 months ago
parent 5333e65219
commit e9bd1ee4e0
23 changed files with 66 additions and 47 deletions
Show Stats Download Patch File Download Diff File

4
.env.development
Unescape View File

@ -5,8 +5,8 @@ VUE_APP_TITLE = 金鸡湖现代服务业品牌管理系统
ENV = 'development' ENV = 'development'
# 金鸡湖现代服务业品牌管理系统/开发环境 # 金鸡湖现代服务业品牌管理系统/开发环境
VUE_APP_BASE_API = 'http://192.168.0.105:9040' # VUE_APP_BASE_API = 'http://192.168.0.105:9040'
# VUE_APP_BASE_API = 'http://39.101.188.84:9040' VUE_APP_BASE_API = 'http://39.101.188.84:9040'
# VUE_APP_BASE_API = 'https://idp.sipac.gov.cn/api' # VUE_APP_BASE_API = 'https://idp.sipac.gov.cn/api'
# 路由懒加载 # 路由懒加载

2
package.json
Unescape View File

@ -1,6 +1,6 @@
{ {
"name": "ruoyi", "name": "ruoyi",
"version": "1.0.202406201411", "version": "1.0.202406210919",
"description": "金鸡湖现代服务业品牌管理系统", "description": "金鸡湖现代服务业品牌管理系统",
"author": "若依", "author": "若依",
"license": "MIT", "license": "MIT",

4
src/components/Editor/index.vue
Unescape View File

@ -60,7 +60,7 @@ export default {
}, },
data() { data() {
return { return {
uploadUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址 uploadUrl: location.origin + '/api' + "/common/upload", // 上传的图片服务器地址
headers: { headers: {
Authorization: "Bearer " + getToken() Authorization: "Bearer " + getToken()
}, },
@ -194,7 +194,7 @@ export default {
// 获取光标所在位置 // 获取光标所在位置
let length = quill.getSelection().index; let length = quill.getSelection().index;
// 插入图片 res.url为服务器返回的图片地址 // 插入图片 res.url为服务器返回的图片地址
quill.insertEmbed(length, "image", process.env.VUE_APP_BASE_API + res.fileName); quill.insertEmbed(length, "image", location.origin + '/api' + res.fileName);
// 调整光标到最后 // 调整光标到最后
quill.setSelection(length + 1); quill.setSelection(length + 1);
} else { } else {

4
src/components/FileUpload/index.vue
Unescape View File

@ -72,8 +72,8 @@ export default {
return { return {
number: 0, number: 0,
uploadList: [], uploadList: [],
baseUrl: process.env.VUE_APP_BASE_API, baseUrl: location.origin + '/api' ,
uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传文件服务器地址 uploadFileUrl: location.origin + '/api' + "/common/upload", // 上传文件服务器地址
headers: { headers: {
Authorization: "Bearer " + getToken(), Authorization: "Bearer " + getToken(),
}, },

4
src/components/ImagePreview/index.vue
Unescape View File

@ -39,7 +39,7 @@ export default {
if (isExternal(real_src)) { if (isExternal(real_src)) {
return real_src; return real_src;
} }
return process.env.VUE_APP_BASE_API + real_src; return location.origin + '/api' + real_src;
}, },
realSrcList() { realSrcList() {
if (!this.src) { if (!this.src) {
@ -51,7 +51,7 @@ export default {
if (isExternal(item)) { if (isExternal(item)) {
return srcList.push(item); return srcList.push(item);
} }
return srcList.push(process.env.VUE_APP_BASE_API + item); return srcList.push(location.origin + '/api' + item);
}); });
return srcList; return srcList;
}, },

4
src/components/ImageUpload/index.vue
Unescape View File

@ -76,8 +76,8 @@ export default {
dialogImageUrl: "", dialogImageUrl: "",
dialogVisible: false, dialogVisible: false,
hideUpload: false, hideUpload: false,
baseUrl: process.env.VUE_APP_BASE_API, baseUrl: location.origin + '/api' ,
uploadImgUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址 uploadImgUrl: location.origin + '/api' + "/common/upload", // 上传的图片服务器地址
headers: { headers: {
Authorization: "Bearer " + getToken(), Authorization: "Bearer " + getToken(),
}, },

2
src/layout/components/FixedHeader/index.vue
Unescape View File

@ -90,7 +90,7 @@ export default {
// location.href = "/index"; // location.href = "/index";
// console.log("this.$store.state.user.userType",this.$store.state.user.userType); // console.log("this.$store.state.user.userType",this.$store.state.user.userType);
// if(this.$store.state.user.userType == "01") { // if(this.$store.state.user.userType == "01") {
// location.href = process.env.VUE_APP_BASE_API + "/system/singlelogin/login" // location.href = location.origin + '/api' + "/system/singlelogin/login"
// } else { // } else {
// this.$router.replace("/login"); // this.$router.replace("/login");
// } // }

24
src/permission.js
Unescape View File

@ -53,7 +53,7 @@ router.beforeEach((to, from, next) => {
}).catch((err) => { }).catch((err) => {
store.dispatch("LogOut").then(() => { store.dispatch("LogOut").then(() => {
Message.error(err); Message.error(err);
location.href = process.env.VUE_APP_BASE_API + "/system/singlelogin/login" location.href = location.origin + '/api' + "/system/singlelogin/login"
}); });
}); });
} else { } else {
@ -149,17 +149,17 @@ router.beforeEach((to, from, next) => {
} }
} else { } else {
// 没有token // 没有token
// if (whiteList.indexOf(to.path) !== -1) { if (whiteList.indexOf(to.path) !== -1) {
// // 在免登录白名单，直接进入 // 在免登录白名单，直接进入
// next(); next();
// } else { } else {
// next(`/login?redirect=${encodeURIComponent(to.fullPath)}`); // 否则全部重定向到登录页 next(`/login?redirect=${encodeURIComponent(to.fullPath)}`); // 否则全部重定向到登录页
// NProgress.done(); NProgress.done();
// } }
store.dispatch("LogOut").then(() => { // store.dispatch("LogOut").then(() => {
Message.error(err); // Message.error(err);
location.href = process.env.VUE_APP_BASE_API + "/system/singlelogin/login" // location.href = location.origin + '/api' + "/system/singlelogin/login"
}); // });
} }
}); });

2
src/plugins/download.js
Unescape View File

@ -5,7 +5,7 @@ import { getToken } from '@/utils/auth'
import errorCode from '@/utils/errorCode' import errorCode from '@/utils/errorCode'
import { blobValidate } from "@/utils/ruoyi"; import { blobValidate } from "@/utils/ruoyi";
const baseURL = process.env.VUE_APP_BASE_API const baseURL = location.origin + '/api'
let downloadLoadingInstance; let downloadLoadingInstance;
export default { export default {

6
src/store/modules/user.js
Unescape View File

@ -134,7 +134,7 @@ const user = {
getInfo().then(res => { getInfo().then(res => {
// console.log(res); // console.log(res);
const user = res.user const user = res.user
const avatar = (user.avatar == "" || user.avatar == null) ? require("@/assets/images/profile.jpg") : process.env.VUE_APP_BASE_API + user.avatar; const avatar = (user.avatar == "" || user.avatar == null) ? require("@/assets/images/profile.jpg") : location.origin + '/api' + user.avatar;
if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组 if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组
commit('SET_ROLES', res.roles) commit('SET_ROLES', res.roles)
commit('SET_PERMISSIONS', res.permissions) commit('SET_PERMISSIONS', res.permissions)
@ -180,7 +180,7 @@ const user = {
commit('SET_ROLES', []) commit('SET_ROLES', [])
commit('SET_PERMISSIONS', []) commit('SET_PERMISSIONS', [])
removeToken() removeToken()
resolve() resolve({userType:state.userType})
}) })
}).catch(error => { }).catch(error => {
reject(error) reject(error)
@ -193,7 +193,7 @@ const user = {
commit('SET_ROLES', []) commit('SET_ROLES', [])
commit('SET_PERMISSIONS', []) commit('SET_PERMISSIONS', [])
removeToken() removeToken()
resolve() resolve({userType:state.userType})
}).catch(error => { }).catch(error => {
reject(error) reject(error)
}) })

2
src/utils/request.js
Unescape View File

@ -16,7 +16,7 @@ axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
// 创建axios实例 // 创建axios实例
const service = axios.create({ const service = axios.create({
// axios中请求配置有baseURL选项，表示请求URL公共部分 // axios中请求配置有baseURL选项，表示请求URL公共部分
baseURL: process.env.VUE_APP_BASE_API, baseURL: location.origin + '/api' ,
// 超时 // 超时
timeout: 10000 timeout: 10000
}) })

2
src/views/enterpriselibrary/enterInfo/components/tabOne/index.vue
Unescape View File

@ -96,7 +96,7 @@ export default {
info:[], info:[],
fileInfo:[], fileInfo:[],
loading:false, loading:false,
VUE_APP_BASE_API:process.env.VUE_APP_BASE_API, VUE_APP_BASE_API:location.origin + '/api' ,
} }
}, },
mounted() { mounted() {

4
src/views/enterpriselibrary/index.vue
Unescape View File

@ -174,7 +174,7 @@ export default {
}, },
title:"导入企业", title:"导入企业",
infoVisible:false, infoVisible:false,
baseUrl: process.env.VUE_APP_BASE_API, baseUrl: location.origin + '/api' ,
// 用户导入参数 // 用户导入参数
upload: { upload: {
// 是否禁用上传 // 是否禁用上传
@ -184,7 +184,7 @@ export default {
// 设置上传的请求头部 // 设置上传的请求头部
headers: { Authorization: "Bearer " + getToken() }, headers: { Authorization: "Bearer " + getToken() },
// 上传的地址 // 上传的地址
url: process.env.VUE_APP_BASE_API + "/system/enterpriseBasicInfo/importEnterprise" url: location.origin + '/api' + "/system/enterpriseBasicInfo/importEnterprise"
}, },
fileList: [], fileList: [],
number: 0, number: 0,

29
src/views/login.vue
Unescape View File

@ -7,7 +7,7 @@
class="login-form" class="login-form"
> >
<!-- <h3 class="title">若依后台管理系统</h3> --> <!-- <h3 class="title">若依后台管理系统</h3> -->
<el-tabs v-model="userType"> <el-tabs v-model="userType" @tab-click="handleClick">
<el-tab-pane label="企业用户登录" name="01"></el-tab-pane> <el-tab-pane label="企业用户登录" name="01"></el-tab-pane>
<el-tab-pane label="政务用户登录" name="02"></el-tab-pane> <el-tab-pane label="政务用户登录" name="02"></el-tab-pane>
</el-tabs> </el-tabs>
@ -75,6 +75,15 @@
<span v-if="!loading">登 录</span> <span v-if="!loading">登 录</span>
<span v-else>登 录 中...</span> <span v-else>登 录 中...</span>
</el-button> </el-button>
<el-button
size="medium"
type="primary"
style="width: 100%;margin-left: 0;margin-top: 20px;"
@click.native.prevent="changeHttp"
>
<span>政务通统一身份认证登录</span>
<!-- <span v-else>登 录 中...</span> -->
</el-button>
<div style="float: right" v-if="register"> <div style="float: right" v-if="register">
<router-link class="link-type" :to="'/register'" <router-link class="link-type" :to="'/register'"
>立即注册</router-link >立即注册</router-link
@ -147,10 +156,15 @@ export default {
}, },
}, },
created() { created() {
this.getCode(); // this.getCode();
this.getCookie(); this.getCookie();
}, },
methods: { methods: {
handleClick(tab){
if(tab.index == "1") {
this.getCode();
}
},
getCode() { getCode() {
getCodeImg().then((res) => { getCodeImg().then((res) => {
this.captchaEnabled = this.captchaEnabled =
@ -174,7 +188,7 @@ export default {
}, },
handleLogin() { handleLogin() {
if(this.userType == '01') { if(this.userType == '01') {
location.href = process.env.VUE_APP_BASE_API + "/system/singlelogin/login" location.href = location.origin + '/api' + "/system/singlelogin/login"
} else { } else {
this.$refs.loginForm.validate((valid) => { this.$refs.loginForm.validate((valid) => {
if (valid) { if (valid) {
@ -200,13 +214,18 @@ export default {
.catch(() => { .catch(() => {
this.loading = false; this.loading = false;
if (this.captchaEnabled) { if (this.captchaEnabled) {
this.getCode(); if(this.userType == "02") {
this.getCode();
}
} }
}); });
} }
}); });
} }
}, },
changeHttp(){
location.href = "https://qyt.sipac.gov.cn/sipsg-enterprise-mobile-manage/#/login"
},
}, },
}; };
</script> </script>
@ -240,7 +259,7 @@ export default {
border-radius: 6px; border-radius: 6px;
background: #ffffff; background: #ffffff;
width: 400px; width: 400px;
height: 380px; height: 420px;
padding: 25px 25px 5px 25px; padding: 25px 25px 5px 25px;
box-shadow: 0 4px 20px 0 rgba(0, 0, 0, 0.15); box-shadow: 0 4px 20px 0 rgba(0, 0, 0, 0.15);
.el-input { .el-input {

2
src/views/monitor/druid/index.vue
Unescape View File

@ -8,7 +8,7 @@ export default {
components: { iFrame }, components: { iFrame },
data() { data() {
return { return {
url: process.env.VUE_APP_BASE_API + "/druid/login.html" url: location.origin + '/api' + "/druid/login.html"
}; };
}, },
}; };

2
src/views/onlineDeclaration/declareDetailContent/index.vue
Unescape View File

@ -1945,7 +1945,7 @@ export default {
dicts: ['bms_responsibility_unit', 'bms_level', 'bms_affiliation_type', 'sys_declaration_type', 'jjh_project_type', 'template_industry', 'new_template_type'], dicts: ['bms_responsibility_unit', 'bms_level', 'bms_affiliation_type', 'sys_declaration_type', 'jjh_project_type', 'template_industry', 'new_template_type'],
data() { data() {
return { return {
VUE_APP_BASE_API:process.env.VUE_APP_BASE_API, VUE_APP_BASE_API:location.origin + '/api' ,
size: '', size: '',
templateInfo: {}, templateInfo: {},
baseInfo: {}, baseInfo: {},

2
src/views/onlineDeclaration/records/components/index.vue
Unescape View File

@ -714,7 +714,7 @@ export default {
name:"updataChange", name:"updataChange",
data() { data() {
return { return {
VUE_APP_BASE_API:process.env.VUE_APP_BASE_API, VUE_APP_BASE_API:location.origin + '/api' ,
openCity: false, openCity: false,
enterpriseInfo: {}, enterpriseInfo: {},
form:{ form:{

4
src/views/project/index.vue
Unescape View File

@ -282,8 +282,8 @@ export default {
// 设置上传的请求头部 // 设置上传的请求头部
headers: { Authorization: "Bearer " + getToken() }, headers: { Authorization: "Bearer " + getToken() },
// 上传的地址 // 上传的地址
// url: process.env.VUE_APP_BASE_API + "/jjh/jProject/export" // url: location.origin + '/api' + "/jjh/jProject/export"
url: process.env.VUE_APP_BASE_API + "/jjh/jProject/importTemplateProject" url: location.origin + '/api' + "/jjh/jProject/importTemplateProject"
}, },
tabHeader: undefined, tabHeader: undefined,
}; };

2
src/views/project/projectInfo/components/tabOne/index.vue
Unescape View File

@ -161,7 +161,7 @@ export default {
info:[], info:[],
fileInfo:[], fileInfo:[],
loading:false, loading:false,
VUE_APP_BASE_API:process.env.VUE_APP_BASE_API, VUE_APP_BASE_API:location.origin + '/api' ,
} }
}, },
mounted() { mounted() {

2
src/views/system/user/index.vue
Unescape View File

@ -431,7 +431,7 @@ export default {
// 设置上传的请求头部 // 设置上传的请求头部
headers: { Authorization: "Bearer " + getToken() }, headers: { Authorization: "Bearer " + getToken() },
// 上传的地址 // 上传的地址
url: process.env.VUE_APP_BASE_API + "/system/user/importData" url: location.origin + '/api' + "/system/user/importData"
}, },
// 查询参数 // 查询参数
queryParams: { queryParams: {

2
src/views/system/user/profile/userAvatar.vue
Unescape View File

@ -137,7 +137,7 @@ export default {
formData.append("avatarfile", data, this.options.filename); formData.append("avatarfile", data, this.options.filename);
uploadAvatar(formData).then(response => { uploadAvatar(formData).then(response => {
this.open = false; this.open = false;
this.options.img = process.env.VUE_APP_BASE_API + response.imgUrl; this.options.img = location.origin + '/api' + response.imgUrl;
store.commit('SET_AVATAR', this.options.img); store.commit('SET_AVATAR', this.options.img);
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess("修改成功");
this.visible = false; this.visible = false;

2
src/views/tool/swagger/index.vue
Unescape View File

@ -8,7 +8,7 @@ export default {
components: { iFrame }, components: { iFrame },
data() { data() {
return { return {
url: process.env.VUE_APP_BASE_API + "/swagger-ui/index.html" url: location.origin + '/api' + "/swagger-ui/index.html"
}; };
}, },
}; };

2
vue.config.js
Unescape View File

@ -19,7 +19,7 @@ module.exports = {
// 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上 // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上
// 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。 // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。
// demo/JinJiHu // demo/JinJiHu
publicPath: process.env.NODE_ENV === "production" ? "./" : "/", publicPath: process.env.NODE_ENV === "production" ? "/demo/JinJiHu" : "/",
// 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist） // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
outputDir: "dist", outputDir: "dist",
// 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下） // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）

Write Preview
Loading…
Cancel
Save