Skip to content

H
haobanDevOps
Commit ad113fae by liuchenxi
Options

Merge branch 'feature/权限管理'

parents 388c97ea 0fc14f7a
Showing with 41 additions and 26 deletions
build/webpack.base.conf.js
...@@ -89,6 +89,13 @@ module.exports = { ...@@ -89,6 +89,13 @@ module.exports = {
} }
] ]
}, },
externals: {
vue: 'Vue',
axios: 'axios',
vuex: 'Vuex',
'vue-router': 'VueRouter',
'element-ui': 'ELEMENT',
},
node: { node: {
// prevent webpack from injecting useless setImmediate polyfill because Vue // prevent webpack from injecting useless setImmediate polyfill because Vue
// source contains it (although only uses it if it's native). // source contains it (although only uses it if it's native).
......
build/webpack.dev.conf.js
...@@ -82,7 +82,7 @@ module.exports = new Promise((resolve, reject) => { ...@@ -82,7 +82,7 @@ module.exports = new Promise((resolve, reject) => {
// Add FriendlyErrorsPlugin // Add FriendlyErrorsPlugin
devWebpackConfig.plugins.push(new FriendlyErrorsPlugin({ devWebpackConfig.plugins.push(new FriendlyErrorsPlugin({
compilationSuccessInfo: { compilationSuccessInfo: {
messages: [`Your application is running here: http://${devWebpackConfig.devServer.host}:${port}`], messages: [`Your application is running here: http://${devWebpackConfig.devServer.host}:${port}${config.dev.assetsPublicPath}/`],
}, },
onErrors: config.dev.notifyOnErrors onErrors: config.dev.notifyOnErrors
? utils.createNotifierCallback() ? utils.createNotifierCallback()
......
config/index.js
...@@ -8,7 +8,7 @@ module.exports = { ...@@ -8,7 +8,7 @@ module.exports = {
dev: { dev: {
// Paths // Paths
assetsSubDirectory: "static", assetsSubDirectory: "static",
assetsPublicPath: "/", assetsPublicPath: "/haoban-devops",
proxyTable: proxyConfig.proxyList, proxyTable: proxyConfig.proxyList,
// Various Dev Server settings // Various Dev Server settings
......
index.html
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
<html> <html>
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
<link rel="shortcut icon" href="./favicon.ico"> <link rel="shortcut icon" href="./favicon.ico">
<link rel="stylesheet" href="//at.alicdn.com/t/font_2995156_rf810o69kh.css"> <link rel="stylesheet" href="//at.alicdn.com/t/font_2995156_rf810o69kh.css">
<title>运维平台</title> <title>运维平台</title>
...@@ -10,5 +9,13 @@ ...@@ -10,5 +9,13 @@
<body> <body>
<div id="app"></div> <div id="app"></div>
<!-- built files will be auto injected --> <!-- built files will be auto injected -->
<script>
(function() {
var src = '/component/static/import-component.js?timestrap=' + new Date().getTime();
var host = window.location.host;
host = host.indexOf('localhost') > -1 || host.indexOf('192.168') > -1 ? 'gicdev.demogic.com' : host;
document.write('<script src="//' + host + src + '"><\/script>');
})();
</script>
</body> </body>
</html> </html>
package-lock.json
...@@ -2914,7 +2914,7 @@ ...@@ -2914,7 +2914,7 @@
}, },
"de-indent": { "de-indent": {
"version": "1.0.2", "version": "1.0.2",
"resolved": "http://registry.npm.taobao.org/de-indent/download/de-indent-1.0.2.tgz", "resolved": "https://registry.nlark.com/de-indent/download/de-indent-1.0.2.tgz",
"integrity": "sha1-sgOOhG3DO6pXlhKNCAS0VbjB4h0=", "integrity": "sha1-sgOOhG3DO6pXlhKNCAS0VbjB4h0=",
"dev": true "dev": true
}, },
...@@ -12342,9 +12342,9 @@ ...@@ -12342,9 +12342,9 @@
} }
}, },
"vue": { "vue": {
"version": "2.6.10", "version": "2.6.6",
"resolved": "http://registry.npm.taobao.org/vue/download/vue-2.6.10.tgz?cache=0&other_urls=http%3A%2F%2Fregistry.npm.taobao.org%2Fvue%2Fdownload%2Fvue-2.6.10.tgz", "resolved": "https://registry.npmmirror.com/vue/download/vue-2.6.6.tgz",
"integrity": "sha1-pysaQqTYKnIepDjRtr9V5mGVxjc=" "integrity": "sha512-Y2DdOZD8sxApS+iUlwv1v8U1qN41kq6Kw45lM6nVZKhygeWA49q7VCCXkjXqeDBXgurrKWkYQ9cJeEJwAq0b9Q=="
}, },
"vue-axios": { "vue-axios": {
"version": "2.1.4", "version": "2.1.4",
...@@ -12502,9 +12502,9 @@ ...@@ -12502,9 +12502,9 @@
} }
}, },
"vue-template-compiler": { "vue-template-compiler": {
"version": "2.6.10", "version": "2.6.6",
"resolved": "http://registry.npm.taobao.org/vue-template-compiler/download/vue-template-compiler-2.6.10.tgz", "resolved": "https://registry.npmmirror.com/vue-template-compiler/download/vue-template-compiler-2.6.6.tgz",
"integrity": "sha1-MjtPNJXwT6o1AzN6gvXWUHeZycw=", "integrity": "sha1-qAesvz1Rlx03IddeyxuSe1F8GgI=",
"dev": true, "dev": true,
"requires": { "requires": {
"de-indent": "^1.0.2", "de-indent": "^1.0.2",
......
package.json
...@@ -16,12 +16,12 @@ ...@@ -16,12 +16,12 @@
"dependencies": { "dependencies": {
"@antv/g2": "^3.5.12", "@antv/g2": "^3.5.12",
"axios": "^0.18.0", "axios": "^0.18.0",
"element-ui": "^2.15.7", "element-ui": "^2.15.6",
"less": "^3.9.0", "less": "^3.9.0",
"less-loader": "^4.1.0", "less-loader": "^4.1.0",
"vue": "^2.5.2", "vue": "2.6.6",
"vue-axios": "^2.1.4", "vue-axios": "^2.1.4",
"vue-router": "^3.0.7", "vue-router": "^3.0.2",
"vuex": "^3.1.0" "vuex": "^3.1.0"
}, },
"devDependencies": { "devDependencies": {
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
"url-loader": "^0.5.8", "url-loader": "^0.5.8",
"vue-loader": "^13.3.0", "vue-loader": "^13.3.0",
"vue-style-loader": "^3.1.2", "vue-style-loader": "^3.1.2",
"vue-template-compiler": "^2.5.2", "vue-template-compiler": "2.6.6",
"webpack": "^3.6.0", "webpack": "^3.6.0",
"webpack-bundle-analyzer": "^2.9.0", "webpack-bundle-analyzer": "^2.9.0",
"webpack-dev-server": "^2.9.1", "webpack-dev-server": "^2.9.1",
......
src/main.js
...@@ -11,7 +11,7 @@ import axios from 'axios'; ...@@ -11,7 +11,7 @@ import axios from 'axios';
import store from './store/store'; // 状态管理器 vuex import store from './store/store'; // 状态管理器 vuex
import '../static/css/public.css'; // 公用样式 import '../static/css/public.css'; // 公用样式
import 'element-ui/lib/theme-chalk/index.css'; // elementUI的样式 // import 'element-ui/lib/theme-chalk/index.css'; // elementUI的样式
import '../static/font/iconfont.css'; // iconfont import '../static/font/iconfont.css'; // iconfont
import '../theme/index.css'; // 新主题 import '../theme/index.css'; // 新主题
import './assets/common.css'; import './assets/common.css';
...@@ -85,10 +85,12 @@ Vue.axios.interceptors.response.use( ...@@ -85,10 +85,12 @@ Vue.axios.interceptors.response.use(
); );
/* eslint-disable no-new */ /* eslint-disable no-new */
new Vue({ window.getLimit(router, 'haoban-devops').then(() => {
el: '#app', new Vue({
router, el: '#app',
store, router,
components: { App }, store,
template: '<App/>' components: { App },
template: '<App/>'
});
}); });
src/views/haoban/api-retry.vue
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
width="90" width="90"
fixed="right"> fixed="right">
<template slot-scope="{row}"> <template slot-scope="{row}">
<el-button type="text" @click.prevent.native="retry(row.id)">重试</el-button> <el-button v-if="$getButtonLimit($buttonCode.interfaceRetry)" :limit-code="$buttonCode.interfaceRetry" type="text" @click.prevent.native="retry(row.id)">重试</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -281,4 +281,4 @@ export default { ...@@ -281,4 +281,4 @@ export default {
text-align: right; text-align: right;
} }
} }
</style> </style>
\ No newline at end of file
src/views/haoban/business-list.vue
...@@ -48,6 +48,7 @@ ...@@ -48,6 +48,7 @@
width="200"> width="200">
<template slot-scope="{row}"> <template slot-scope="{row}">
<el-button <el-button
v-if="$getButtonLimit($buttonCode.customerInformation)" :limit-code="$buttonCode.customerInformation"
@click.native.prevent="$router.push({ path: '/business-log?name=平台运维&icon=icon-03&code=platform_operation&tabCode=platform_business_list', query: { enterpriseId: row.enterpriseId } })" @click.native.prevent="$router.push({ path: '/business-log?name=平台运维&icon=icon-03&code=platform_operation&tabCode=platform_business_list', query: { enterpriseId: row.enterpriseId } })"
type="text"> type="text">
客户资料 客户资料
...@@ -182,4 +183,4 @@ export default { ...@@ -182,4 +183,4 @@ export default {
text-align: right; text-align: right;
margin-top: 20px; margin-top: 20px;
} }
</style> </style>
\ No newline at end of file
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