system-clients 1.6.68-foric → 1.6.69-foric
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -1,75 +1,75 @@
|
|
|
1
|
-
var path = require('path')
|
|
2
|
-
var cssLoaders = require('./css-loaders')
|
|
3
|
-
var projectRoot = path.resolve(__dirname, '../')
|
|
4
|
-
|
|
5
|
-
module.exports = {
|
|
6
|
-
entry: {
|
|
7
|
-
app: './src/main.js'
|
|
8
|
-
},
|
|
9
|
-
output: {
|
|
10
|
-
path: path.resolve(__dirname, '../dist/static'),
|
|
11
|
-
publicPath: 'static/',
|
|
12
|
-
filename: '[name].js'
|
|
13
|
-
},
|
|
14
|
-
resolve: {
|
|
15
|
-
extensions: ['', '.js', '.vue'],
|
|
16
|
-
fallback: [path.join(__dirname, '../node_modules')],
|
|
17
|
-
alias: {
|
|
18
|
-
'test': path.resolve(__dirname, '../test'),
|
|
19
|
-
'src': path.resolve(__dirname, '../src')
|
|
20
|
-
}
|
|
21
|
-
},
|
|
22
|
-
resolveLoader: {
|
|
23
|
-
fallback: [path.join(__dirname, '../node_modules')]
|
|
24
|
-
},
|
|
25
|
-
module: {
|
|
26
|
-
loaders: [
|
|
27
|
-
{
|
|
28
|
-
test: /\.vue$/,
|
|
29
|
-
loader: 'vue'
|
|
30
|
-
},
|
|
31
|
-
{
|
|
32
|
-
test: /\.js$/,
|
|
33
|
-
loader: 'babel',
|
|
34
|
-
include: [
|
|
35
|
-
`${projectRoot}\\src`,
|
|
36
|
-
`${projectRoot}\\build`,
|
|
37
|
-
`${projectRoot}\\examples`,
|
|
38
|
-
`${projectRoot}\\test`,
|
|
39
|
-
`${projectRoot}\\node_modules\\vue-client\\src`,
|
|
40
|
-
`${projectRoot}\\node_modules\\vue-strap\\src`
|
|
41
|
-
]
|
|
42
|
-
},
|
|
43
|
-
{
|
|
44
|
-
test: /\.json$/,
|
|
45
|
-
loader: 'json'
|
|
46
|
-
},
|
|
47
|
-
{
|
|
48
|
-
test: /\.html$/,
|
|
49
|
-
loader: 'vue-html'
|
|
50
|
-
},
|
|
51
|
-
{
|
|
52
|
-
test: /\.less$/,
|
|
53
|
-
loader: 'style!css!less'
|
|
54
|
-
},
|
|
55
|
-
{
|
|
56
|
-
test: /\.(png|jpg|gif|svg|woff2?|eot|ttf)(\?.*)?$/,
|
|
57
|
-
loader: 'url',
|
|
58
|
-
query: {
|
|
59
|
-
limit: 10000,
|
|
60
|
-
name: '[name].[ext]?[hash:7]'
|
|
61
|
-
}
|
|
62
|
-
}
|
|
63
|
-
]
|
|
64
|
-
},
|
|
65
|
-
vue: {
|
|
66
|
-
loaders: cssLoaders({
|
|
67
|
-
sourceMap: false,
|
|
68
|
-
extract: false
|
|
69
|
-
})
|
|
70
|
-
},
|
|
71
|
-
plugins: [],
|
|
72
|
-
eslint: {
|
|
73
|
-
formatter: require('eslint-friendly-formatter')
|
|
74
|
-
}
|
|
75
|
-
}
|
|
1
|
+
var path = require('path')
|
|
2
|
+
var cssLoaders = require('./css-loaders')
|
|
3
|
+
var projectRoot = path.resolve(__dirname, '../')
|
|
4
|
+
|
|
5
|
+
module.exports = {
|
|
6
|
+
entry: {
|
|
7
|
+
app: './src/main.js'
|
|
8
|
+
},
|
|
9
|
+
output: {
|
|
10
|
+
path: path.resolve(__dirname, '../dist/static'),
|
|
11
|
+
publicPath: 'static/',
|
|
12
|
+
filename: '[name].js'
|
|
13
|
+
},
|
|
14
|
+
resolve: {
|
|
15
|
+
extensions: ['', '.js', '.vue'],
|
|
16
|
+
fallback: [path.join(__dirname, '../node_modules')],
|
|
17
|
+
alias: {
|
|
18
|
+
'test': path.resolve(__dirname, '../test'),
|
|
19
|
+
'src': path.resolve(__dirname, '../src')
|
|
20
|
+
}
|
|
21
|
+
},
|
|
22
|
+
resolveLoader: {
|
|
23
|
+
fallback: [path.join(__dirname, '../node_modules')]
|
|
24
|
+
},
|
|
25
|
+
module: {
|
|
26
|
+
loaders: [
|
|
27
|
+
{
|
|
28
|
+
test: /\.vue$/,
|
|
29
|
+
loader: 'vue'
|
|
30
|
+
},
|
|
31
|
+
{
|
|
32
|
+
test: /\.js$/,
|
|
33
|
+
loader: 'babel',
|
|
34
|
+
include: [
|
|
35
|
+
`${projectRoot}\\src`,
|
|
36
|
+
`${projectRoot}\\build`,
|
|
37
|
+
`${projectRoot}\\examples`,
|
|
38
|
+
`${projectRoot}\\test`,
|
|
39
|
+
`${projectRoot}\\node_modules\\vue-client\\src`,
|
|
40
|
+
`${projectRoot}\\node_modules\\vue-strap\\src`
|
|
41
|
+
]
|
|
42
|
+
},
|
|
43
|
+
{
|
|
44
|
+
test: /\.json$/,
|
|
45
|
+
loader: 'json'
|
|
46
|
+
},
|
|
47
|
+
{
|
|
48
|
+
test: /\.html$/,
|
|
49
|
+
loader: 'vue-html'
|
|
50
|
+
},
|
|
51
|
+
{
|
|
52
|
+
test: /\.less$/,
|
|
53
|
+
loader: 'style!css!less'
|
|
54
|
+
},
|
|
55
|
+
{
|
|
56
|
+
test: /\.(png|jpg|gif|svg|woff2?|eot|ttf)(\?.*)?$/,
|
|
57
|
+
loader: 'url',
|
|
58
|
+
query: {
|
|
59
|
+
limit: 10000,
|
|
60
|
+
name: '[name].[ext]?[hash:7]'
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
]
|
|
64
|
+
},
|
|
65
|
+
vue: {
|
|
66
|
+
loaders: cssLoaders({
|
|
67
|
+
sourceMap: false,
|
|
68
|
+
extract: false
|
|
69
|
+
})
|
|
70
|
+
},
|
|
71
|
+
plugins: [],
|
|
72
|
+
eslint: {
|
|
73
|
+
formatter: require('eslint-friendly-formatter')
|
|
74
|
+
}
|
|
75
|
+
}
|
package/package.json
CHANGED
|
@@ -1,5 +1,8 @@
|
|
|
1
1
|
<template>
|
|
2
|
-
<div class="
|
|
2
|
+
<div class="ssoLoadingMain" v-if="!showlogin && isSso">
|
|
3
|
+
<img class="ssoLoadingImg" src="../../../static/login-do.gif">
|
|
4
|
+
</div>
|
|
5
|
+
<div class="loginbg" v-if="showlogin">
|
|
3
6
|
<span class="logotitle"></span>
|
|
4
7
|
<!-- <img src="../../../static/huangtengbiaozhi.png" alt="图片加载未完成" class="img-responsive logotitle" /> -->
|
|
5
8
|
<div class="notice-board" style="height:40%;">
|
|
@@ -125,6 +128,7 @@
|
|
|
125
128
|
self.$goto(goto, {functions: self.$login.f})
|
|
126
129
|
return
|
|
127
130
|
}
|
|
131
|
+
self.showlogin = false
|
|
128
132
|
self.$goto('home-page', {functions: self.$login.f})
|
|
129
133
|
} catch (ret) {
|
|
130
134
|
console.error('登录失败', ret)
|
|
@@ -152,6 +156,7 @@
|
|
|
152
156
|
title: '登录',
|
|
153
157
|
ready () {
|
|
154
158
|
if (window.location.href.includes('ticket')) {
|
|
159
|
+
this.isSso = true
|
|
155
160
|
let url = window.location.href.split("?")[1]
|
|
156
161
|
let obj = {}
|
|
157
162
|
for (let params of url.split("&")) {
|
|
@@ -165,6 +170,7 @@
|
|
|
165
170
|
this.$resetpost('/sso/logic/serviceValidate', params,{resolveMsg: null, rejectMsg: null}).then((re) => {
|
|
166
171
|
// this.$showMessage("re----" + JSON.stringify(re))
|
|
167
172
|
if (re.data.code === 200) {
|
|
173
|
+
this.showlogin = false
|
|
168
174
|
let condition = `ename = '${re.data.data.userName}'`
|
|
169
175
|
this.$resetpost('rs/sql/singleTable', {data: { items: '*', tablename: 't_user', condition: condition}}, {resolveMsg: null, rejectMsg: null}).then((res) => {
|
|
170
176
|
if (res.data && res.data.length > 0) {
|
|
@@ -176,17 +182,9 @@
|
|
|
176
182
|
}
|
|
177
183
|
})
|
|
178
184
|
} else {
|
|
179
|
-
|
|
180
|
-
this.model.ename = this.$login.getUrlCompileParames('name')
|
|
181
|
-
this.model.password = this.$login.getUrlCompileParames('password')
|
|
182
|
-
this.confirm()
|
|
183
|
-
}
|
|
184
|
-
$('#login-button').click(function (event) {
|
|
185
|
-
event.preventDefault()
|
|
186
|
-
$('form').fadeOut(500)
|
|
187
|
-
}),
|
|
188
|
-
this.createCode()
|
|
185
|
+
this.showlogin = true
|
|
189
186
|
}
|
|
187
|
+
this.isSso = false
|
|
190
188
|
})
|
|
191
189
|
} else {
|
|
192
190
|
if (this.$login && this.$login.getUrlCompileParames('name') && this.$login.getUrlCompileParames('password')) {
|
|
@@ -206,6 +204,8 @@
|
|
|
206
204
|
config: {
|
|
207
205
|
isMac: false
|
|
208
206
|
},
|
|
207
|
+
showlogin: true,
|
|
208
|
+
isSso: false,
|
|
209
209
|
login: false,
|
|
210
210
|
model: {},
|
|
211
211
|
show: false,
|
|
@@ -607,4 +607,12 @@
|
|
|
607
607
|
transform: translateY(-700px) rotate(600deg);
|
|
608
608
|
}
|
|
609
609
|
}
|
|
610
|
+
.ssoLoadingMain .ssoLoadingImg {
|
|
611
|
+
position: absolute;
|
|
612
|
+
top:0;
|
|
613
|
+
left: 0;
|
|
614
|
+
bottom: 0;
|
|
615
|
+
right: 0;
|
|
616
|
+
margin: auto;
|
|
617
|
+
}
|
|
610
618
|
</style>
|
|
Binary file
|
|
Binary file
|
|
Binary file
|