Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop

This commit is contained in:
zhangyc
2022-12-23 16:24:26 +08:00
4 changed files with 27 additions and 26 deletions

1
.gitignore vendored
View File

@@ -27,3 +27,4 @@ src/api/config.js
src/api/config.js src/api/config.js
src/api/config.js src/api/config.js
src/api/config.js src/api/config.js
fe-manage-develop.iml

View File

@@ -44,7 +44,7 @@ export default defineComponent({
const store = useStore(); const store = useStore();
const isLogin = ref(false); const isLogin = ref(false);
// console.log("router", router.getRoutes(), route); // console.log("router", router.getRoutes(), route);
console.log("版本1.01------------"); console.log("版本1.02------------");
const routes = computed(() => { const routes = computed(() => {
return router.getRoutes().filter((e) => e.meta?.isLink); return router.getRoutes().filter((e) => e.meta?.isLink);
}); });

View File

@@ -3288,11 +3288,11 @@ const columns7 = [
key: "5", key: "5",
align: "center", align: "center",
customRender: ({ record }) => { customRender: ({ record }) => {
switch (String(record.source)) { switch (String(record.status)) {
case "0": case "0":
return "待审核";
case "1":
return "审核通过"; return "审核通过";
case "1":
return "待审核";
case "2": case "2":
return "审核拒绝"; return "审核拒绝";
} }
@@ -3410,11 +3410,11 @@ export default defineComponent({
key: "5", key: "5",
align: "center", align: "center",
customRender: ({ record }) => { customRender: ({ record }) => {
switch (String(record.source)) { switch (String(record.status)) {
case "0": case "0":
return "待审核";
case "1":
return "审核通过"; return "审核通过";
case "1":
return "待审核";
case "2": case "2":
return "审核拒绝"; return "审核拒绝";
} }

View File

@@ -9,23 +9,23 @@
const { defineConfig } = require("@vue/cli-service"); const { defineConfig } = require("@vue/cli-service");
module.exports = defineConfig({ module.exports = defineConfig({
publicPath: "/manage-release", publicPath: "/manage",
// transpileDependencies: true, // transpileDependencies: true,
devServer: { devServer: {
port: 8080, port: 8080,
proxy: { proxy: {
"/manageApi": { "/manageApi": {
target: process.env.VUE_APP_PROXY_URL, target: process.env.VUE_APP_PROXY_URL,
changeOrigin: true, //表示是否改变原域名 changeOrigin: true, //表示是否改变原域名
// secure: false, // secure: false,
// ws: false, //表示WebSocket协议 // ws: false, //表示WebSocket协议
pathRewrite: { pathRewrite: {
"^/manageApi": "", "^/manageApi": "",
}, },
},"/userbasic": { }, "/userbasic": {
target: process.env.VUE_APP_BOE_API_URL, target: process.env.VUE_APP_BOE_API_URL,
changeOrigin: true, //表示是否改变原域名 changeOrigin: true, //表示是否改变原域名
}, },
}, },
}, },
}); });