@@ -50,16 +20,16 @@
+
+
\ No newline at end of file
diff --git a/src/views/system/UserList.vue b/src/views/system/UserList.vue
index 73dceb5..d02e79b 100644
--- a/src/views/system/UserList.vue
+++ b/src/views/system/UserList.vue
@@ -1,392 +1,280 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 请选择
- 男
- 女
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 请选择
- 正常
- 冻结
-
-
-
-
-
-
-
- 查询
- 重置
-
- {{ toggleSearchStatus ? '收起' : '展开' }}
-
-
-
-
-
-
-
-
-
添加用户
-
导出
-
- 导入
-
-
-
回收站
-
-
-
-
- 删除
-
-
-
- 冻结
-
-
-
- 解冻
-
-
-
- 批量操作
-
+
+
+
+
+ 
+ Add
-
-
-
+ Edit
+
+
+ 
+ Delete
+
+
+ 
+ Reset pwd
+
+
+
+
+
-
-
-
-
-
-
+ @change="handleTableChange"
+ :selectedRowKeys.sync="selectedRowKeys"
+ >
+
+ {{ index + 1 }}
-
-
- 编辑
-
-
-
-
-
- 更多
-
-
-
- 详情
-
-
-
- 密码
-
-
-
-
- 删除
-
-
-
-
-
- 冻结
-
-
-
-
-
- 解冻
-
-
-
-
-
-
-
-
-
+
-
\ No newline at end of file
+
diff --git a/src/views/user/Login.vue b/src/views/user/Login.vue
index 3f6401a..150bdb9 100644
--- a/src/views/user/Login.vue
+++ b/src/views/user/Login.vue
@@ -127,7 +127,7 @@ export default {
},
//登录成功
loginSuccess () {
- this.$router.push({ path: "/dashboard/analysis" }).catch(()=>{
+ this.$router.push({ path: "/station-operation" }).catch(()=>{
console.log('登录跳转首页出错,这个错误从哪里来的')
})
this.$notification.success({
diff --git a/src/views/user/third/JeecgThirdLoginMixin.js b/src/views/user/third/JeecgThirdLoginMixin.js
index ff030eb..297595b 100644
--- a/src/views/user/third/JeecgThirdLoginMixin.js
+++ b/src/views/user/third/JeecgThirdLoginMixin.js
@@ -183,7 +183,7 @@ export const JeecgThirdLoginMixin = {
// update-begin- author:sunjianlei --- date:20190812 --- for: 登录成功后不解除禁用按钮，防止多次点击
// this.loginBtn = false
// update-end- author:sunjianlei --- date:20190812 --- for: 登录成功后不解除禁用按钮，防止多次点击
- this.$router.push({ path: "/dashboard/analysis" }).catch(()=>{
+ this.$router.push({ path: "/station-operation" }).catch(()=>{
console.log('登录跳转首页出错,这个错误从哪里来的')
})
this.$notification.success({
diff --git a/vue.config.js b/vue.config.js
index dd1ecae..ca24075 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -1,5 +1,5 @@
const path = require('path')
-const CompressionPlugin = require("compression-webpack-plugin")
+const CompressionPlugin = require('compression-webpack-plugin')
function resolve(dir) {
return path.join(__dirname, dir)
@@ -14,8 +14,8 @@ module.exports = {
*/
// 如果你不需要生产环境的 source map，可以将其设置为 false 以加速生产环境构建。
productionSourceMap: false,
- //qiankuan打包时放开
- //outputDir: "../dist/main",
+ // qiankuan打包时放开
+ // outputDir: "../dist/main",
// 多入口配置
// pages: {
// index: {
@@ -24,10 +24,10 @@ module.exports = {
// filename: 'index.html',
// }
// },
- //打包app时放开该配置
- //publicPath:'/',
+ // 打包app时放开该配置
+ // publicPath:'/',
configureWebpack: config => {
- //生产环境取消 console.log
+ // 生产环境取消 console.log
if (process.env.NODE_ENV === 'production') {
config.optimization.minimizer[0].options.terserOptions.compress.drop_console = true
}
@@ -40,7 +40,7 @@ module.exports = {
.set('@comp', resolve('src/components'))
.set('@views', resolve('src/views'))
- //生产环境，开启js\css压缩
+ // 生产环境，开启js\css压缩
if (process.env.NODE_ENV === 'production') {
config.plugin('compressionPlugin').use(new CompressionPlugin({
test: /\.(js|css|less)$/, // 匹配文件名
@@ -68,7 +68,6 @@ module.exports = {
.use()
.loader('babel-loader')
.end()
-
},
css: {
@@ -76,11 +75,12 @@ module.exports = {
less: {
modifyVars: {
/* less 变量覆盖，用于自定义 ant design 主题 */
- 'primary-color': '#1890FF',
- 'link-color': '#1890FF',
+ 'primary-color': '#1397a3',
+ 'link-color': '#1397a3',
'border-radius-base': '4px',
+ 'text-color': '#fff'
},
- javascriptEnabled: true,
+ javascriptEnabled: true
}
}
},
@@ -104,16 +104,16 @@ module.exports = {
pathRewrite: {
'/jeecg-boot': '' //默认所有请求都加了jeecg-boot前缀，需要去掉
}
- },*/
+ }, */
/* 注意：jeecgboot前端做了改造，此处不需要配置跨域和后台接口（只需要改.env相关配置文件即可）
- issues/3462 很多人此处做了配置，导致刷新前端404问题，请一定注意*/
+ issues/3462 很多人此处做了配置，导致刷新前端404问题，请一定注意 */
'/jeecg-boot': {
target: 'http://localhost:8080',
ws: false,
changeOrigin: true
- },
+ }
}
},
lintOnSave: undefined
-}
\ No newline at end of file
+}
+ 
+ search
+ 
+ 
+ 