system-clients 3.2.1-28 → 3.2.1-31
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.
- package/.gradle/3.5.1/file-changes/last-build.bin +0 -0
- package/.gradle/3.5.1/taskHistory/taskHistory.lock +0 -0
- package/SystemClient.iml +8 -8
- package/package.json +1 -1
- package/src/components/Main.vue +2 -2
- package/src/components/server/LoadData.vue +55 -55
- package/src/components/server/Login.vue +835 -835
- package/src/filiale/rizhao/Login.vue +2 -2
- package/src/system.js +109 -109
|
Binary file
|
|
Binary file
|
package/SystemClient.iml
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
<?xml version="1.0" encoding="UTF-8"?>
|
|
2
|
-
<module external.linked.project.id="SystemClient" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
|
|
3
|
-
<component name="NewModuleRootManager" inherit-compiler-output="true">
|
|
4
|
-
<exclude-output />
|
|
5
|
-
<content url="file://$MODULE_DIR$" />
|
|
6
|
-
<orderEntry type="inheritedJdk" />
|
|
7
|
-
<orderEntry type="sourceFolder" forTests="false" />
|
|
8
|
-
</component>
|
|
1
|
+
<?xml version="1.0" encoding="UTF-8"?>
|
|
2
|
+
<module external.linked.project.id="SystemClient" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
|
|
3
|
+
<component name="NewModuleRootManager" inherit-compiler-output="true">
|
|
4
|
+
<exclude-output />
|
|
5
|
+
<content url="file://$MODULE_DIR$" />
|
|
6
|
+
<orderEntry type="inheritedJdk" />
|
|
7
|
+
<orderEntry type="sourceFolder" forTests="false" />
|
|
8
|
+
</component>
|
|
9
9
|
</module>
|
package/package.json
CHANGED
package/src/components/Main.vue
CHANGED
|
@@ -279,7 +279,7 @@ export default {
|
|
|
279
279
|
this.changeShow()
|
|
280
280
|
this.gotoWorkOrderSite()
|
|
281
281
|
// 获取预约列表
|
|
282
|
-
this.functions.f_role_name.includes(this.config.msgRole) && this.config.isTip && this.getOrderList()
|
|
282
|
+
this.functions.f_role_name && this.functions.f_role_name.includes(this.config.msgRole) && this.config.isTip && this.getOrderList()
|
|
283
283
|
},
|
|
284
284
|
methods: {
|
|
285
285
|
getOrderList(){
|
|
@@ -299,7 +299,7 @@ export default {
|
|
|
299
299
|
let http = new HttpResetClass()
|
|
300
300
|
await http.load('POST', '/rs/sql/singleTable', {data: {
|
|
301
301
|
tablename:'t_order_center',
|
|
302
|
-
condition:` f_orderstate != '预约成功' and f_orgstr ='${this.$login.f.orgid}' and
|
|
302
|
+
condition:` (f_orderstate != '预约成功' and f_orgstr ='${this.$login.f.orgid}' and f_orderstate != '预约失败' ) or f_orderstate is null`
|
|
303
303
|
}}, {
|
|
304
304
|
resolveMsg: null,
|
|
305
305
|
rejectMsg: null
|
|
@@ -1,55 +1,55 @@
|
|
|
1
|
-
<template>
|
|
2
|
-
<div class="loadingdata" :class="{'loaderror': show, 'loadsuccess': !show}">
|
|
3
|
-
<!-- <h2 style="margin: 0" v-if="show">{{msg}}</h2> -->
|
|
4
|
-
<h2 style="margin: 0" v-if="show">参数加载失败，请检查网络状态和服务状态...</h2>
|
|
5
|
-
</div>
|
|
6
|
-
</template>
|
|
7
|
-
|
|
8
|
-
<script>
|
|
9
|
-
export default {
|
|
10
|
-
title: '加载参数',
|
|
11
|
-
data () {
|
|
12
|
-
return {
|
|
13
|
-
msg: '',
|
|
14
|
-
show: false
|
|
15
|
-
}
|
|
16
|
-
},
|
|
17
|
-
props: {
|
|
18
|
-
componentName: {}
|
|
19
|
-
},
|
|
20
|
-
async ready () {
|
|
21
|
-
this.$nextTick(() => {
|
|
22
|
-
window.addEventListener('message', messageEvent => {
|
|
23
|
-
try {
|
|
24
|
-
const data = messageEvent.data
|
|
25
|
-
console.log('接收到数据', data)
|
|
26
|
-
this.$login = Object.assign(this.$login, data.login)
|
|
27
|
-
this.$appdata = Object.assign(this.$appdata, data.appdata)
|
|
28
|
-
if (!data.page) {
|
|
29
|
-
this.$showMessage('没有功能连接, 请配置!')
|
|
30
|
-
return
|
|
31
|
-
}
|
|
32
|
-
this.$goto(data.page)
|
|
33
|
-
} catch (e) {
|
|
34
|
-
console.log('登陆异常', e)
|
|
35
|
-
}
|
|
36
|
-
})
|
|
37
|
-
})
|
|
38
|
-
}
|
|
39
|
-
}
|
|
40
|
-
</script>
|
|
41
|
-
<style media="screen">
|
|
42
|
-
.loadingdata {
|
|
43
|
-
position: fixed;
|
|
44
|
-
background: #fff;
|
|
45
|
-
opacity: 0.6;
|
|
46
|
-
top: 0;
|
|
47
|
-
width: 100%;
|
|
48
|
-
}
|
|
49
|
-
.loaderror {
|
|
50
|
-
opacity: 1;
|
|
51
|
-
}
|
|
52
|
-
.loadsuccess {
|
|
53
|
-
display: none;
|
|
54
|
-
}
|
|
55
|
-
</style>
|
|
1
|
+
<template>
|
|
2
|
+
<div class="loadingdata" :class="{'loaderror': show, 'loadsuccess': !show}">
|
|
3
|
+
<!-- <h2 style="margin: 0" v-if="show">{{msg}}</h2> -->
|
|
4
|
+
<h2 style="margin: 0" v-if="show">参数加载失败，请检查网络状态和服务状态...</h2>
|
|
5
|
+
</div>
|
|
6
|
+
</template>
|
|
7
|
+
|
|
8
|
+
<script>
|
|
9
|
+
export default {
|
|
10
|
+
title: '加载参数',
|
|
11
|
+
data () {
|
|
12
|
+
return {
|
|
13
|
+
msg: '',
|
|
14
|
+
show: false
|
|
15
|
+
}
|
|
16
|
+
},
|
|
17
|
+
props: {
|
|
18
|
+
componentName: {}
|
|
19
|
+
},
|
|
20
|
+
async ready () {
|
|
21
|
+
this.$nextTick(() => {
|
|
22
|
+
window.addEventListener('message', messageEvent => {
|
|
23
|
+
try {
|
|
24
|
+
const data = messageEvent.data
|
|
25
|
+
console.log('接收到数据', data)
|
|
26
|
+
this.$login = Object.assign(this.$login, data.login)
|
|
27
|
+
this.$appdata = Object.assign(this.$appdata, data.appdata)
|
|
28
|
+
if (!data.page) {
|
|
29
|
+
this.$showMessage('没有功能连接, 请配置!')
|
|
30
|
+
return
|
|
31
|
+
}
|
|
32
|
+
this.$goto(data.page)
|
|
33
|
+
} catch (e) {
|
|
34
|
+
console.log('登陆异常', e)
|
|
35
|
+
}
|
|
36
|
+
})
|
|
37
|
+
})
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
</script>
|
|
41
|
+
<style media="screen">
|
|
42
|
+
.loadingdata {
|
|
43
|
+
position: fixed;
|
|
44
|
+
background: #fff;
|
|
45
|
+
opacity: 0.6;
|
|
46
|
+
top: 0;
|
|
47
|
+
width: 100%;
|
|
48
|
+
}
|
|
49
|
+
.loaderror {
|
|
50
|
+
opacity: 1;
|
|
51
|
+
}
|
|
52
|
+
.loadsuccess {
|
|
53
|
+
display: none;
|
|
54
|
+
}
|
|
55
|
+
</style>
|