diff --git a/.env.development b/.env.development index 82f07d9..b2cda0a 100644 --- a/.env.development +++ b/.env.development @@ -5,8 +5,8 @@ VUE_APP_TITLE = 金鸡湖现代服务业品牌管理系统 ENV = 'development' # 金鸡湖现代服务业品牌管理系统/开发环境 -# 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://192.168.0.118:9040' +# VUE_APP_BASE_API = 'http://39.101.188.84:9040' # VUE_APP_BASE_API = 'https://idp.sipac.gov.cn/api' # 路由懒加载 diff --git a/package.json b/package.json index 2288109..cd03932 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ruoyi", - "version": "1.0.202406210919", + "version": "1.0.202406211358", "description": "金鸡湖现代服务业品牌管理系统", "author": "若依", "license": "MIT", diff --git a/src/api/jin_ji_hu/project/index.js b/src/api/jin_ji_hu/project/index.js index 46aca72..91ef48e 100644 --- a/src/api/jin_ji_hu/project/index.js +++ b/src/api/jin_ji_hu/project/index.js @@ -24,6 +24,15 @@ export function jProjectDel(params) { }) } +// 根据信用代码查询企业id +export function getUserId(params) { + return request({ + url: "/system/enterpriseBasicInfo/getCreditCode", + method: "get", + params + }) +} + /** * 备忘录 diff --git a/src/assets/styles/font.css b/src/assets/styles/font.css new file mode 100644 index 0000000..a2b8e83 --- /dev/null +++ b/src/assets/styles/font.css @@ -0,0 +1,4 @@ +@font-face { + font-family: "PingFang-SC"; + src: url("./font/PingFang_Heavy.ttf"); +} \ No newline at end of file diff --git a/src/assets/styles/font/PingFang_Heavy.ttf b/src/assets/styles/font/PingFang_Heavy.ttf new file mode 100644 index 0000000..f4cf788 Binary files /dev/null and b/src/assets/styles/font/PingFang_Heavy.ttf differ diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index 38e8015..dc17d7e 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -6,6 +6,7 @@ @import "./btn.scss"; @import "./buttonType.scss"; @import "./public.scss"; +@import './font.css'; body { height: 100%; diff --git a/src/assets/styles/public.scss b/src/assets/styles/public.scss index 222b347..f527965 100644 --- a/src/assets/styles/public.scss +++ b/src/assets/styles/public.scss @@ -180,6 +180,9 @@ height: 100%; } } + .L_row { + height: calc(100% - 40px); + } .left-info{ height: calc(25% - 5px); background-color: white; diff --git a/src/components/Breadcrumb/index.vue b/src/components/Breadcrumb/index.vue index 00733bc..e0a1cc2 100644 --- a/src/components/Breadcrumb/index.vue +++ b/src/components/Breadcrumb/index.vue @@ -14,13 +14,13 @@ - 返回 + >返回 --> diff --git a/src/components/Editor/index.vue b/src/components/Editor/index.vue index 3337591..7ea4322 100644 --- a/src/components/Editor/index.vue +++ b/src/components/Editor/index.vue @@ -60,7 +60,7 @@ export default { }, data() { return { - uploadUrl: location.origin + '/api' + "/common/upload", // 上传的图片服务器地址 + uploadUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址 headers: { Authorization: "Bearer " + getToken() }, @@ -194,7 +194,7 @@ export default { // 获取光标所在位置 let length = quill.getSelection().index; // 插入图片 res.url为服务器返回的图片地址 - quill.insertEmbed(length, "image", location.origin + '/api' + res.fileName); + quill.insertEmbed(length, "image", process.env.VUE_APP_BASE_API + res.fileName); // 调整光标到最后 quill.setSelection(length + 1); } else { diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue index f2c9e52..c7f6b0a 100644 --- a/src/components/FileUpload/index.vue +++ b/src/components/FileUpload/index.vue @@ -72,8 +72,8 @@ export default { return { number: 0, uploadList: [], - baseUrl: location.origin + '/api' , - uploadFileUrl: location.origin + '/api' + "/common/upload", // 上传文件服务器地址 + baseUrl: process.env.VUE_APP_BASE_API, + uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传文件服务器地址 headers: { Authorization: "Bearer " + getToken(), }, diff --git a/src/components/ImagePreview/index.vue b/src/components/ImagePreview/index.vue index fd59e3b..3c770c7 100644 --- a/src/components/ImagePreview/index.vue +++ b/src/components/ImagePreview/index.vue @@ -39,7 +39,7 @@ export default { if (isExternal(real_src)) { return real_src; } - return location.origin + '/api' + real_src; + return process.env.VUE_APP_BASE_API + real_src; }, realSrcList() { if (!this.src) { @@ -51,7 +51,7 @@ export default { if (isExternal(item)) { return srcList.push(item); } - return srcList.push(location.origin + '/api' + item); + return srcList.push(process.env.VUE_APP_BASE_API + item); }); return srcList; }, diff --git a/src/components/ImageUpload/index.vue b/src/components/ImageUpload/index.vue index 11c1622..2e64c9b 100644 --- a/src/components/ImageUpload/index.vue +++ b/src/components/ImageUpload/index.vue @@ -76,8 +76,8 @@ export default { dialogImageUrl: "", dialogVisible: false, hideUpload: false, - baseUrl: location.origin + '/api' , - uploadImgUrl: location.origin + '/api' + "/common/upload", // 上传的图片服务器地址 + baseUrl: process.env.VUE_APP_BASE_API, + uploadImgUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址 headers: { Authorization: "Bearer " + getToken(), }, diff --git a/src/layout/components/FixedHeader/index.vue b/src/layout/components/FixedHeader/index.vue index 68193a9..055bed5 100644 --- a/src/layout/components/FixedHeader/index.vue +++ b/src/layout/components/FixedHeader/index.vue @@ -90,7 +90,7 @@ export default { // location.href = "/index"; // console.log("this.$store.state.user.userType",this.$store.state.user.userType); // if(this.$store.state.user.userType == "01") { - // location.href = location.origin + '/api' + "/system/singlelogin/login" + // location.href = process.env.VUE_APP_BASE_API + "/system/singlelogin/login" // } else { // this.$router.replace("/login"); // } diff --git a/src/permission.js b/src/permission.js index b0b7139..9f524e6 100644 --- a/src/permission.js +++ b/src/permission.js @@ -53,7 +53,7 @@ router.beforeEach((to, from, next) => { }).catch((err) => { store.dispatch("LogOut").then(() => { Message.error(err); - location.href = location.origin + '/api' + "/system/singlelogin/login" + location.href = process.env.VUE_APP_BASE_API + "/system/singlelogin/login" }); }); } else { @@ -158,7 +158,7 @@ router.beforeEach((to, from, next) => { } // store.dispatch("LogOut").then(() => { // Message.error(err); - // location.href = location.origin + '/api' + "/system/singlelogin/login" + // location.href = process.env.VUE_APP_BASE_API + "/system/singlelogin/login" // }); } }); diff --git a/src/plugins/download.js b/src/plugins/download.js index ab27122..42acd00 100644 --- a/src/plugins/download.js +++ b/src/plugins/download.js @@ -5,7 +5,7 @@ import { getToken } from '@/utils/auth' import errorCode from '@/utils/errorCode' import { blobValidate } from "@/utils/ruoyi"; -const baseURL = location.origin + '/api' +const baseURL = process.env.VUE_APP_BASE_API let downloadLoadingInstance; export default { diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 4f94f0a..36a8fb5 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -134,7 +134,7 @@ const user = { getInfo().then(res => { // console.log(res); const user = res.user - const avatar = (user.avatar == "" || user.avatar == null) ? require("@/assets/images/profile.jpg") : location.origin + '/api' + user.avatar; + const avatar = (user.avatar == "" || user.avatar == null) ? require("@/assets/images/profile.jpg") : process.env.VUE_APP_BASE_API + user.avatar; if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组 commit('SET_ROLES', res.roles) commit('SET_PERMISSIONS', res.permissions) diff --git a/src/utils/request.js b/src/utils/request.js index 6471c8d..d273357 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -16,7 +16,7 @@ axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8' // 创建axios实例 const service = axios.create({ // axios中请求配置有baseURL选项，表示请求URL公共部分 - baseURL: location.origin + '/api' , + baseURL: process.env.VUE_APP_BASE_API, // 超时 timeout: 10000 }) diff --git a/src/views/enterpriselibrary/enterInfo/components/tabOne/index.vue b/src/views/enterpriselibrary/enterInfo/components/tabOne/index.vue index 4fd0cfc..2f6b864 100644 --- a/src/views/enterpriselibrary/enterInfo/components/tabOne/index.vue +++ b/src/views/enterpriselibrary/enterInfo/components/tabOne/index.vue @@ -96,7 +96,7 @@ export default { info:[], fileInfo:[], loading:false, - VUE_APP_BASE_API:location.origin + '/api' , + VUE_APP_BASE_API:process.env.VUE_APP_BASE_API, } }, mounted() { diff --git a/src/views/enterpriselibrary/enterInfo/index.vue b/src/views/enterpriselibrary/enterInfo/index.vue index 22bbbc0..721b59c 100644 --- a/src/views/enterpriselibrary/enterInfo/index.vue +++ b/src/views/enterpriselibrary/enterInfo/index.vue @@ -24,7 +24,7 @@
返回 - 导出企业清单 +
diff --git a/src/views/enterpriselibrary/index.vue b/src/views/enterpriselibrary/index.vue index 9cc8895..b2a5d96 100644 --- a/src/views/enterpriselibrary/index.vue +++ b/src/views/enterpriselibrary/index.vue @@ -174,7 +174,7 @@ export default { }, title:"导入企业", infoVisible:false, - baseUrl: location.origin + '/api' , + baseUrl: process.env.VUE_APP_BASE_API, // 用户导入参数 upload: { // 是否禁用上传 @@ -184,7 +184,7 @@ export default { // 设置上传的请求头部 headers: { Authorization: "Bearer " + getToken() }, // 上传的地址 - url: location.origin + '/api' + "/system/enterpriseBasicInfo/importEnterprise" + url: process.env.VUE_APP_BASE_API + "/system/enterpriseBasicInfo/importEnterprise" }, fileList: [], number: 0, diff --git a/src/views/login.vue b/src/views/login.vue index f296483..69b9706 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -123,8 +123,8 @@ export default { return { codeUrl: "", loginForm: { - username: "admin", - password: "admin123", + username: "", // admin + password: "", // admin123 rememberMe: false, code: "", uuid: "", @@ -188,7 +188,7 @@ export default { }, handleLogin() { if(this.userType == '01') { - location.href = location.origin + '/api' + "/system/singlelogin/login" + location.href = process.env.VUE_APP_BASE_API + "/system/singlelogin/login" } else { this.$refs.loginForm.validate((valid) => { if (valid) { diff --git a/src/views/monitor/druid/index.vue b/src/views/monitor/druid/index.vue index a5b8d84..c6ad585 100644 --- a/src/views/monitor/druid/index.vue +++ b/src/views/monitor/druid/index.vue @@ -8,7 +8,7 @@ export default { components: { iFrame }, data() { return { - url: location.origin + '/api' + "/druid/login.html" + url: process.env.VUE_APP_BASE_API + "/druid/login.html" }; }, }; diff --git a/src/views/onlineDeclaration/declareAddContent/index.vue b/src/views/onlineDeclaration/declareAddContent/index.vue index ca870b1..70a0539 100644 --- a/src/views/onlineDeclaration/declareAddContent/index.vue +++ b/src/views/onlineDeclaration/declareAddContent/index.vue @@ -1269,12 +1269,12 @@
- - + + - +
@@ -1295,7 +1295,7 @@
返回 - 暂存 + 提交
diff --git a/src/views/onlineDeclaration/declareDetailContent/index.vue b/src/views/onlineDeclaration/declareDetailContent/index.vue index ee583e7..3a64091 100644 --- a/src/views/onlineDeclaration/declareDetailContent/index.vue +++ b/src/views/onlineDeclaration/declareDetailContent/index.vue @@ -1,7 +1,7 @@