Skip to content

严立 / framework-flow

Go to a project
Commit a2415598 by 黄燕娟
Options

fix:配置

parent c10a7555
Inline Side-by-side
Showing with 45 additions and 27 deletions
.env.development
# 开发环境配置 # 开发环境配置
VUE_APP_MODE = 'development' VUE_APP_MODE = 'development'
# Jeeplus快速开发平台/开发环境 # Jeeplus快速开发平台/开发环境
VUE_APP_BASE_API = '/api' VUE_APP_BASE_API = '/api'
VITE_AXIOS_API_PRIMARY = 'http://rapidplatform.meiqicloud.com/' VITE_AXIOS_API_PRIMARY = 'http://rapidplatform.meiqicloud.com/api'
VUE_APP_SERVER_URL = 'http://rapidplatform.meiqicloud.com/' VUE_APP_SERVER_URL = 'http://rapidplatform.meiqicloud.com'
.env.test
# 开发环境配置 # 开发环境配置
VUE_APP_MODE = 'test' VUE_APP_MODE = 'test'
VUE_APP_BASE_API = '/api' VUE_APP_BASE_API = '/api'
VITE_AXIOS_API_PRIMARY = 'http://rapidplatform.meiqicloud.com/' VITE_AXIOS_API_PRIMARY = 'http://rapidplatform.meiqicloud.com/api'
VUE_APP_SERVER_URL = 'http://sz-tianma.meiqicloud.com/api' VUE_APP_SERVER_URL = 'http://sz-tianma.meiqicloud.com/api'
src/api/modelGroup.js
...@@ -58,7 +58,7 @@ export function updateModelGroupName(groupId, param) { ...@@ -58,7 +58,7 @@ export function updateModelGroupName(groupId, param) {
// 新增模型分组 // 新增模型分组
export function createModelGroup(param) { export function createModelGroup(param) {
return request({ return request({
url: `//a/wflow/model-group/add`, url: `/a/wflow/model-group/add`,
method: 'post', method: 'post',
data: param data: param
}) })
......
src/api/request.js
...@@ -27,12 +27,10 @@ function getQueryString(name) { ...@@ -27,12 +27,10 @@ function getQueryString(name) {
axios.interceptors.request.use( axios.interceptors.request.use(
(config) => { (config) => {
let token = getQueryString('token') || localStorage.getItem("token");
let token = getQueryString('token') //sessionStorage.getItem("token");
let factoryId = localStorage.getItem("factoryId");
if (token || token != "undefined") { if (token || token != "undefined") {
config.headers.factoryId = factoryId;
config.headers.token = token; config.headers.token = token;
localStorage.setItem('token', token)
} }
return config; return config;
}, },
...@@ -46,6 +44,7 @@ axios.interceptors.request.use( ...@@ -46,6 +44,7 @@ axios.interceptors.request.use(
*/ */
axios.interceptors.response.use( axios.interceptors.response.use(
(response) => { (response) => {
console.log('response', response)
let { code } = response.data; let { code } = response.data;
if (code === 501) { if (code === 501) {
window.parent.postMessage( window.parent.postMessage(
...@@ -60,9 +59,11 @@ axios.interceptors.response.use( ...@@ -60,9 +59,11 @@ axios.interceptors.response.use(
// return response // return response
}, },
(error) => { (error) => {
console.log('error', error)
if (!error.response) return Promise.reject(error); if (!error.response) return Promise.reject(error);
const { status, data, config } = error.response; const { code, data, config } = error.response;
switch (status) {
switch (code) {
// 需要重新登录 // 需要重新登录
case 401: { case 401: {
break; break;
...@@ -75,6 +76,9 @@ axios.interceptors.response.use( ...@@ -75,6 +76,9 @@ axios.interceptors.response.use(
case 404: { case 404: {
break; break;
} }
case 500: {
break;
}
case 503: { case 503: {
break; break;
} }
......
src/api/sys.js
...@@ -24,3 +24,11 @@ export function userGroupPage(params) { ...@@ -24,3 +24,11 @@ export function userGroupPage(params) {
data: params data: params
}) })
} }
// 文件上传
export function sysUpload(params) {
return request({
url: `/a/sys/upload`,
method: 'post',
data: params
})
}
\ No newline at end of file
src/components/common/Editor.vue
...@@ -116,15 +116,15 @@ export default { ...@@ -116,15 +116,15 @@ export default {
let mode = sessionStorage.getItem("mode"); let mode = sessionStorage.getItem("mode");
if (process.env.VUE_APP_MODE === "development") { if (process.env.VUE_APP_MODE === "development") {
if (mode !== "PC") { if (mode !== "PC") {
return "/wflow/res"; return "/a/wflow/res";
} else { } else {
return process.env.VUE_APP_BASE_API + "/wflow/res"; return process.env.VUE_APP_BASE_API + "/a/wflow/res";
} }
} else { } else {
if (mode !== "PC") { if (mode !== "PC") {
return "/wflow/res"; return "/a/wflow/res";
} else { } else {
return process.env.VUE_APP_SERVER_URL + "/wflow/res"; return process.env.VUE_APP_SERVER_URL + "/a/wflow/res";
} }
} }
}, },
......
src/main.js
...@@ -89,7 +89,8 @@ window.addEventListener("message", function (e) { ...@@ -89,7 +89,8 @@ window.addEventListener("message", function (e) {
sessionStorage.setItem("isAndroid", e.data.isAndroid || "0"); sessionStorage.setItem("isAndroid", e.data.isAndroid || "0");
//发起人 //发起人
sessionStorage.setItem("initiator", e.data.initiator || ""); localStorage.setItem("initiator", e.data.initiator || "");
new Vue({ new Vue({
router, router,
store, store,
......
src/views/common/form/components/FileUpload.vue
...@@ -136,15 +136,15 @@ export default { ...@@ -136,15 +136,15 @@ export default {
let mode = sessionStorage.getItem("mode"); let mode = sessionStorage.getItem("mode");
if (process.env.VUE_APP_MODE === "development") { if (process.env.VUE_APP_MODE === "development") {
if (mode !== "PC") { if (mode !== "PC") {
return "/wflow/res"; return "/a/wflow/res";
} else { } else {
return process.env.VUE_APP_BASE_API + "/wflow/res"; return process.env.VUE_APP_BASE_API + "/a/wflow/res";
} }
} else { } else {
if (mode !== "PC") { if (mode !== "PC") {
return "/wflow/res"; return "/a/wflow/res";
} else { } else {
return process.env.VUE_APP_SERVER_URL + "/wflow/res"; return process.env.VUE_APP_SERVER_URL + "/a/wflow/res";
} }
} }
}, },
...@@ -227,7 +227,7 @@ export default { ...@@ -227,7 +227,7 @@ export default {
}, },
removeFile(fileId) { removeFile(fileId) {
axios axios
.delete(`${process.env.VUE_APP_BASE_API}/wflow/res/${fileId}`) .delete(`${process.env.VUE_APP_BASE_API}/a/wflow/res/${fileId}`)
.then((rsp) => { .then((rsp) => {
this.$message.success("移除文件成功"); this.$message.success("移除文件成功");
}); });
......
src/views/common/form/components/ImageUpload.vue
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
auto-upload auto-upload
:before-upload="beforeUpload" :before-upload="beforeUpload"
> >
<!-- :http-request="uploadImg" -->
<i slot="default" class="el-icon-plus"></i> <i slot="default" class="el-icon-plus"></i>
<div slot="tip" class="el-upload__tip"> <div slot="tip" class="el-upload__tip">
{{ placeholder }} {{ sizeTip }} {{ placeholder }} {{ sizeTip }}
...@@ -63,7 +64,7 @@ ...@@ -63,7 +64,7 @@
<script> <script>
import { Uploader, Toast } from "vant"; import { Uploader, Toast } from "vant";
import componentMinxins from "../ComponentMinxins"; import componentMinxins from "../ComponentMinxins";
import axios from "axios"; import axios from "@/api/request";
import { deepClone } from "@/utils/common.js"; import { deepClone } from "@/utils/common.js";
export default { export default {
...@@ -99,15 +100,15 @@ export default { ...@@ -99,15 +100,15 @@ export default {
let mode = sessionStorage.getItem("mode"); let mode = sessionStorage.getItem("mode");
if (process.env.VUE_APP_MODE === "development") { if (process.env.VUE_APP_MODE === "development") {
if (mode !== "PC") { if (mode !== "PC") {
return "/wflow/res"; return "/a/wflow/res";
} else { } else {
return process.env.VUE_APP_BASE_API + "/wflow/res"; return process.env.VUE_APP_BASE_API + "/a/wflow/res";
} }
} else { } else {
if (mode !== "PC") { if (mode !== "PC") {
return "/wflow/res"; return "/a/wflow/res";
} else { } else {
return process.env.VUE_APP_SERVER_URL + "/wflow/res"; return process.env.VUE_APP_SERVER_URL + "/a/wflow/res";
} }
} }
}, },
...@@ -137,7 +138,6 @@ export default { ...@@ -137,7 +138,6 @@ export default {
uploadParams: { isImg: true }, uploadParams: { isImg: true },
headers: { headers: {
token: localStorage.getItem("token"), token: localStorage.getItem("token"),
factoryId: localStorage.getItem("factoryId"),
}, },
catchList: [], catchList: [],
alows: ["image/jpeg", "image/png", "image/gif", "image/jpg"], alows: ["image/jpeg", "image/png", "image/gif", "image/jpg"],
...@@ -171,12 +171,14 @@ export default { ...@@ -171,12 +171,14 @@ export default {
}, },
removeFile(fileId) { removeFile(fileId) {
axios axios
.delete(`${process.env.VUE_APP_BASE_API}/wflow/res/${fileId}`) .delete(`${process.env.VUE_APP_BASE_API}/a/wflow/res/${fileId}`)
.then((rsp) => { .then((rsp) => {
this.$message.success("移除文件成功"); this.$message.success("移除文件成功");
}); });
}, },
uploadSuccess(response, file, fileList) { uploadSuccess(response, file, fileList) {
console.log(4444, response);
this.loading = false; this.loading = false;
this.catchList.push(response); this.catchList.push(response);
let ft = fileList.filter((f) => f.size !== undefined); let ft = fileList.filter((f) => f.size !== undefined);
...@@ -199,6 +201,7 @@ export default { ...@@ -199,6 +201,7 @@ export default {
this.uploadFile(file); this.uploadFile(file);
} }
}, },
// uploadImg(params) {},
uploadFile(file) { uploadFile(file) {
//上传文件 //上传文件
const formData = new FormData(); const formData = new FormData();
......
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 sign in to comment