Commit c4007d58 authored by wanli's avatar wanli

修复前端表格渲染错误

parent bae8cfdf
...@@ -28,6 +28,7 @@ build/ ...@@ -28,6 +28,7 @@ build/
venv/ venv/
node_modules node_modules
frontend_backup
logs/*.log logs/*.log
logs/*.log.* logs/*.log.*
......
{ {
"name": "evm-workbench-admin", "name": "easy-workbench-admin",
"version": "0.1.0", "version": "0.1.0",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
......
...@@ -9,18 +9,13 @@ ...@@ -9,18 +9,13 @@
}, },
"dependencies": { "dependencies": {
"@antv/g2": "^3.2.7", "@antv/g2": "^3.2.7",
"ant-design-vue": "^1.7.5", "ant-design-vue": "1.7.5",
"axios": "^0.18.0", "axios": "^0.18.0",
"codemirror": "^5.59.2",
"core-js": "^3.9.0",
"cropperjs": "^1.5.11",
"plyr": "^3.6.4",
"numeral": "^2.0.6", "numeral": "^2.0.6",
"vue": "^2.5.17", "vue": "^2.5.17",
"vue-i18n": "^8.1.0", "vue-i18n": "^8.1.0",
"vue-router": "^3.0.1", "vue-router": "^3.0.1",
"vuex": "^3.0.1", "vuex": "^3.0.1",
"vue-codemirror": "^4.0.6",
"vuex-router-sync": "^5.0.0" "vuex-router-sync": "^5.0.0"
}, },
"devDependencies": { "devDependencies": {
...@@ -31,7 +26,7 @@ ...@@ -31,7 +26,7 @@
"less": "^3.8.1", "less": "^3.8.1",
"less-loader": "^4.1.0", "less-loader": "^4.1.0",
"svg-sprite-loader": "^3.9.2", "svg-sprite-loader": "^3.9.2",
"vue-template-compiler": "^2.6.12" "vue-template-compiler": "^2.6.14"
}, },
"eslintConfig": { "eslintConfig": {
"root": true, "root": true,
......
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
<a-checkbox :checked="autoLogin" @change="onSwithAutoLogin"> <a-checkbox :checked="autoLogin" @change="onSwithAutoLogin">
自动登录 自动登录
</a-checkbox> </a-checkbox>
<a style="float: right;color: #2ECCCD;" href="#"> 忘记密码 </a> <a style="float: right" href="#"> 忘记密码 </a>
</div> </div>
<a-form-item> <a-form-item>
<a-button <a-button
......
...@@ -72,16 +72,8 @@ ...@@ -72,16 +72,8 @@
width: 100%; width: 100%;
} }
.other {
a {
color: #2ECCCD;
}
}
.submit { .submit {
width: 100%; width: 100%;
margin-top: 24px; margin-top: 24px;
border-color: #2ECCCD;
background-color: #2ECCCD;
} }
} }
...@@ -23,13 +23,10 @@ ...@@ -23,13 +23,10 @@
.submit { .submit {
width: 50%; width: 50%;
border-color: #2ECCCD;
background-color: #2ECCCD;
} }
.login { .login {
float: right; float: right;
color: #2ECCCD;
line-height: @btn-height-lg; line-height: @btn-height-lg;
} }
......
...@@ -10,7 +10,7 @@ function resolve(dir) { ...@@ -10,7 +10,7 @@ function resolve(dir) {
const BASE_URL = process.env.NODE_ENV === "production" ? "/frontend/" : "/"; const BASE_URL = process.env.NODE_ENV === "production" ? "/frontend/" : "/";
module.exports = { module.exports = {
baseUrl: BASE_URL, // 根据你的实际情况更改这里 publicPath: BASE_URL, // 根据你的实际情况更改这里
productionSourceMap: false, productionSourceMap: false,
devServer: { devServer: {
publicPath: BASE_URL, // 和 baseUrl 保持一致 publicPath: BASE_URL, // 和 baseUrl 保持一致
......
"use strict";
// 基础配置文件
const path = require("path");
const webpack = require("webpack");
// 拼接路径
function resolve(dir) {
return path.join(__dirname, dir);
}
// 基础路径 注意发布之前要先修改这里
const BASE_URL = process.env.NODE_ENV === "production" ? "/frontend/" : "/";
module.exports = {
baseUrl: BASE_URL, // 根据你的实际情况更改这里
productionSourceMap: false,
devServer: {
publicPath: BASE_URL, // 和 baseUrl 保持一致
// port: 8080,
// open: true,
// overlay: {
// warnings: false,
// errors: true,
// },
// proxy: {
// // change xxx-api/login => mock/login
// // detail: https://cli.vuejs.org/config/#devserver-proxy
// "/api/v1": {
// target: "http://127.0.0.1:5001/",
// changeOrigin: true,
// pathRewrite: {},
// },
// "/file-manager": {
// target: "https://file-manager.webmai.ru/",
// changeOrigin: true,
// pathRewrite: {},
// },
// "/uowap/": {
// target: "https://web-drcn.hispace.dbankcloud.cn/",
// changeOrigin: true,
// pathRewrite: {},
// },
// },
// after: require("./mock/mock-server.js"),
},
css: {
loaderOptions: {
less: {
modifyVars: {
"ai-prefix": "ai",
"primary-color": "#2ECCCD",
},
paths: [resolve("node_modules"), resolve("src")],
javascriptEnabled: true,
},
},
},
configureWebpack: {
plugins: [
new webpack.ContextReplacementPlugin(
/moment[\\/]locale$/,
/^\.\/(zh-cn|en-us)$/
),
],
},
chainWebpack: (config) => {
const svgRule = config.module.rule("svg");
svgRule.uses.clear();
svgRule.include
.add(resolve("src/assets/svg-icons"))
.end()
.use("svg-sprite-loader")
.loader("svg-sprite-loader")
.options({
symbolId: "ai-[name]",
})
.end();
// image exclude
const imagesRule = config.module.rule("images");
imagesRule
.test(/\.(png|jpe?g|gif|webp|svg)(\?.*)?$/)
.exclude.add(resolve("src/assets/svg-icons"))
.end();
// 重新设置 alias
config.resolve.alias.set("@", resolve("src"));
},
};
...@@ -1465,7 +1465,7 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0: ...@@ -1465,7 +1465,7 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0:
dependencies: dependencies:
color-convert "^2.0.1" color-convert "^2.0.1"
ant-design-vue@^1.1.2: ant-design-vue@1.7.5:
version "1.7.5" version "1.7.5"
resolved "https://registry.yarnpkg.com/ant-design-vue/-/ant-design-vue-1.7.5.tgz#e7ed04cb358adc56be02c7453d2db026d2c405e3" resolved "https://registry.yarnpkg.com/ant-design-vue/-/ant-design-vue-1.7.5.tgz#e7ed04cb358adc56be02c7453d2db026d2c405e3"
integrity sha512-QVrirCz6eetzui+Dv/ujMqUwIr8e/2H+pKr4VC3mpc+cHkw6L9cBRJK7DhfO7GTyK4EWKkEH3lfLWlD/XjUoQQ== integrity sha512-QVrirCz6eetzui+Dv/ujMqUwIr8e/2H+pKr4VC3mpc+cHkw6L9cBRJK7DhfO7GTyK4EWKkEH3lfLWlD/XjUoQQ==
...@@ -8816,7 +8816,7 @@ vue-style-loader@^4.1.0: ...@@ -8816,7 +8816,7 @@ vue-style-loader@^4.1.0:
hash-sum "^1.0.2" hash-sum "^1.0.2"
loader-utils "^1.0.2" loader-utils "^1.0.2"
vue-template-compiler@^2.5.17: vue-template-compiler@^2.6.14:
version "2.6.14" version "2.6.14"
resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.6.14.tgz#a2f0e7d985670d42c9c9ee0d044fed7690f4f763" resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.6.14.tgz#a2f0e7d985670d42c9c9ee0d044fed7690f4f763"
integrity sha512-ODQS1SyMbjKoO1JBJZojSw6FE4qnh9rIpUZn2EUT86FKizx9uH5z6uXiIrm4/Nb/gwxTi/o17ZDEGWAXHvtC7g== integrity sha512-ODQS1SyMbjKoO1JBJZojSw6FE4qnh9rIpUZn2EUT86FKizx9uH5z6uXiIrm4/Nb/gwxTi/o17ZDEGWAXHvtC7g==
......
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 to comment