system-clients 3.1.94-aode → 3.1.96
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/.eslintrc.js +16 -16
- package/.gradle/{5.5 → 5.2.1}/gc.properties +0 -0
- package/{dist/static/.gitkeep → .gradle/buildOutputCleanup/built.bin} +0 -0
- package/.gradle/buildOutputCleanup/cache.properties +2 -2
- package/.gradle/buildOutputCleanup/cache.properties.lock +1 -0
- package/SystemClient.iml +1 -1
- package/build/webpack.base.conf.js +17 -14
- package/package.json +4 -4
- package/src/components/Main.vue +622 -508
- package/src/components/TabButton.vue +201 -0
- package/src/components/Tabs.vue +67 -0
- package/src/components/equipment/EquipmentManage.vue +65 -65
- package/src/components/equipment/PcAdd.vue +5 -5
- package/src/components/equipment/PcList.vue +5 -5
- package/src/components/equipment/PhoneAdd.vue +4 -4
- package/src/components/equipment/PhoneList.vue +4 -4
- package/src/components/equipment/PosAdd.vue +323 -137
- package/src/components/equipment/PosList.vue +294 -164
- package/src/components/equipment/PosManage.vue +138 -67
- package/src/components/equipment/PosManageBoth.vue +125 -0
- package/src/components/equipment/PosParamAdd.vue +236 -0
- package/src/components/equipment/PosParamList.vue +121 -0
- package/src/components/equipment/PosParamManage.vue +51 -0
- package/src/components/parammanage/ParamManage.vue +2 -2
- package/src/components/parammanage/ParamPage.vue +7 -7
- package/src/components/parammanage/SinglePage.vue +4 -4
- package/src/components/server/ImageVieweTest.vue +56 -0
- package/src/components/server/ImageViewer.vue +350 -0
- package/src/components/server/Login.vue +70 -47
- package/src/components/server/PcdBuildingSelect.vue +241 -0
- package/src/components/server/ResSelect.vue +5 -0
- package/src/components/server/ResSelectGroup.vue +155 -118
- package/src/components/server/RightTree.vue +262 -257
- package/src/plugins/GetLoginInfoService.js +514 -514
- package/src/styles/less/aofeng/standard.less +446 -60
- package/src/styles/less/aofeng/themeOne/BinaryTemplate.less +13 -13
- package/src/styles/less/aofeng/themeOne/systemStyle.less +18 -18
- package/src/styles/less/manageStyle/manageStyle/manageChile.less +180 -0
- package/src/styles/less/manageStyle/manageStyle/manageStyle.less +1102 -0
- package/src/styles/less/manageStyle/manageStyle/safeStyle.less +498 -0
- package/src/styles/less/tables.less +50 -0
- package/src/styles/less/type.less +16 -3
- package/src/styles/less/variables.less +6 -3
- package/src/system.js +93 -83
- package/static/{ewmlogo.png → logo.png} +0 -0
- package/static/newStyle/about-us.png +0 -0
- package/yarn-error.log +6896 -0
- package/.gradle/5.5/fileChanges/last-build.bin +0 -0
- package/.gradle/5.5/fileHashes/fileHashes.lock +0 -0
- package/.gradle/buildOutputCleanup/buildOutputCleanup.lock +0 -0
- package/.npmignore +0 -10
- package/build/.npmignore +0 -1
- package/dist/static/batchleft.png +0 -0
- package/dist/static/batchright.png +0 -0
- package/dist/static/bluemainbg.jpg +0 -0
- package/dist/static/huangtengbiaozhi.png +0 -0
- package/dist/static/login_bg.jpg +0 -0
- package/dist/static/login_title.png +0 -0
- package/dist/static/login_title1.png +0 -0
- package/dist/static/loginbg.jpg +0 -0
- package/dist/static/loginlogo.png +0 -0
- package/dist/static/main_logo.png +0 -0
- package/dist/static/mainbg.jpg +0 -0
- package/dist/static/menulogo.png +0 -0
- package/dist/static/newmainbg.jpg +0 -0
- package/dist/static/psicon.png +0 -0
- package/dist/static/singleleft.png +0 -0
- package/dist/static/singleright.png +0 -0
- package/dist/static/treeopen.png +0 -0
- package/dist/static/treeout.png +0 -0
- package/dist/static/treeset.png +0 -0
- package/dist/static/usericon.png +0 -0
- package/dist/static/xinxi.png +0 -0
- package/package-lock.json +0 -10507
- package/src/.npmignore +0 -1
- package/static/aodelogo.png +0 -0
- package/static/aodenewlogo.png +0 -0
@@ -2,27 +2,40 @@
|
|
2
2
|
<div :class="style" v-show="companyshow">
|
3
3
|
<label class="font_normal_body">公  司</label>
|
4
4
|
<right-tree @re-res="getorg"
|
5
|
+
:mustselect="mustselect"
|
5
6
|
:initresid='initres.org'></right-tree>
|
6
7
|
</div>
|
7
8
|
<div :class="style" v-show="departmentshow">
|
8
9
|
<label class="font_normal_body">部  门</label>
|
9
|
-
<res-select restype='department'
|
10
|
+
<res-select restype='department' v-ref:department
|
10
11
|
@res-select="getdep"
|
11
12
|
:parentresid="depresid"
|
12
13
|
:initresid='initres.dep'
|
14
|
+
:mustselect="mustselect"
|
13
15
|
:is-mul="mul">
|
14
16
|
</res-select>
|
15
17
|
</div>
|
16
|
-
<div :class="style" v-show="operatorshow">
|
18
|
+
<div :class="style" v-show="operatorshow && (!cascade)">
|
17
19
|
<label class="font_normal_body">人  员</label>
|
18
20
|
<res-select restype='user'
|
19
21
|
@res-select="getuser"
|
20
22
|
:parentresid="depresid"
|
21
23
|
:initresid='initres.user'
|
24
|
+
:mustselect="mustselect"
|
22
25
|
:is-mul="mul">
|
23
26
|
</res-select>
|
24
27
|
</div>
|
25
|
-
<div :class="style
|
28
|
+
<div :class="style" v-show="operatorshow && cascade">
|
29
|
+
<label class="font_normal_body">人  员</label>
|
30
|
+
<res-select restype='user'
|
31
|
+
@res-select="getuser"
|
32
|
+
:parentresid="userresid"
|
33
|
+
:initresid='initres.user'
|
34
|
+
:mustselect="mustselect"
|
35
|
+
:is-mul="mul">
|
36
|
+
</res-select>
|
37
|
+
</div>
|
38
|
+
<div :class="style " v-if="sliceareashow" >
|
26
39
|
<label class="font_normal_body">片  区</label>
|
27
40
|
<v-select :value.sync="slice_area" v-model="slice_area" @change='getarea'
|
28
41
|
:options='sliceArea' placeholder='片区/管理站' filer-key="name"
|
@@ -31,129 +44,153 @@
|
|
31
44
|
</div>
|
32
45
|
</template>
|
33
46
|
<script>
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
},
|
43
|
-
mul: {
|
44
|
-
type: Boolean,
|
45
|
-
default: true
|
46
|
-
},
|
47
|
-
//初始值
|
48
|
-
initres: {
|
49
|
-
type: Object,
|
50
|
-
default: null,
|
51
|
-
},
|
52
|
-
showComponent:{
|
53
|
-
default:['company','department','operator','slicearea']
|
54
|
-
}
|
47
|
+
import plugin from '../../plugins/GetLoginInfoService'
|
48
|
+
import { HttpResetClass } from 'vue-client'
|
49
|
+
export default {
|
50
|
+
title: '资源选择测试',
|
51
|
+
props: {
|
52
|
+
style: {
|
53
|
+
type: String,
|
54
|
+
default: 'col-sm-2 form-group'
|
55
55
|
},
|
56
|
-
|
57
|
-
|
58
|
-
|
59
|
-
depresid:[],
|
60
|
-
userresid:[],
|
61
|
-
sliceArea: [],
|
62
|
-
slice_area:[],
|
63
|
-
companyshow:false,
|
64
|
-
departmentshow:false,
|
65
|
-
operatorshow:false,
|
66
|
-
sliceareashow:false,
|
67
|
-
obj:{
|
68
|
-
orgnames:[],
|
69
|
-
depnames:[],
|
70
|
-
operatornames:[]
|
71
|
-
}
|
72
|
-
}
|
56
|
+
mul: {
|
57
|
+
type: Boolean,
|
58
|
+
default: true
|
73
59
|
},
|
74
|
-
|
75
|
-
|
76
|
-
|
77
|
-
|
60
|
+
//初始值
|
61
|
+
initres: {
|
62
|
+
type: Object,
|
63
|
+
default: null,
|
78
64
|
},
|
79
|
-
|
80
|
-
|
81
|
-
|
82
|
-
|
83
|
-
|
84
|
-
|
85
|
-
|
86
|
-
|
87
|
-
|
88
|
-
|
89
|
-
|
90
|
-
|
91
|
-
|
92
|
-
|
93
|
-
|
94
|
-
|
95
|
-
|
96
|
-
|
97
|
-
|
98
|
-
|
99
|
-
|
100
|
-
|
101
|
-
|
102
|
-
|
103
|
-
|
104
|
-
|
105
|
-
|
106
|
-
|
65
|
+
showComponent:{
|
66
|
+
default:['company','department','operator','slicearea']
|
67
|
+
},
|
68
|
+
//人员是否和部门关联
|
69
|
+
cascade: {
|
70
|
+
type: Boolean,
|
71
|
+
default: true
|
72
|
+
},
|
73
|
+
selectin: {
|
74
|
+
type: Boolean,
|
75
|
+
default: false
|
76
|
+
}
|
77
|
+
},
|
78
|
+
data () {
|
79
|
+
return {
|
80
|
+
orgresid:[this.$login.f.orgid],
|
81
|
+
depresid:[],
|
82
|
+
userresid:[],
|
83
|
+
sliceArea: [],
|
84
|
+
slice_area:[],
|
85
|
+
companyshow:false,
|
86
|
+
departmentshow:false,
|
87
|
+
operatorshow:false,
|
88
|
+
sliceareashow:false,
|
89
|
+
mustselect:false,
|
90
|
+
obj:{
|
91
|
+
orgnames:[],
|
92
|
+
depnames:[],
|
93
|
+
operatornames:[]
|
94
|
+
}
|
95
|
+
}
|
96
|
+
},
|
97
|
+
ready () {
|
98
|
+
if(this.$login.r.includes('部门默认选中')&& this.selectin){
|
99
|
+
this.initres.dep = [this.$login.f.depids]
|
100
|
+
}
|
101
|
+
if(this.$login.r.includes('人员默认选中')&& this.selectin){
|
102
|
+
this.initres.user = [this.$login.f.id]
|
103
|
+
if(this.$login.r.includes('人员强制选中')){
|
104
|
+
this.mustselect = true
|
105
|
+
}
|
106
|
+
}
|
107
|
+
this.initComponent();
|
108
|
+
this.initAreas(this.$login.f.orgid)
|
109
|
+
},
|
110
|
+
methods:{
|
111
|
+
initComponent(){
|
112
|
+
let self=this;
|
113
|
+
this.showComponent.find((item)=>{
|
114
|
+
switch(item){
|
115
|
+
case 'company': self.companyshow=true; break;
|
116
|
+
case 'department': self.departmentshow=true; break;
|
117
|
+
case 'operator': self.operatorshow=true; break;
|
118
|
+
case 'slicearea': self.sliceareashow=true; break;
|
107
119
|
}
|
108
|
-
}
|
109
|
-
|
120
|
+
})
|
121
|
+
},
|
122
|
+
// 初始化片区
|
123
|
+
async initAreas (val) {
|
124
|
+
if (val) {
|
125
|
+
let http = new HttpResetClass()
|
126
|
+
let getAllArea = await http.load('POST', '/rs/search', {
|
127
|
+
source: 'this.getParentByType($organization$).getAllChildrens().where(row.getType() == $zone$)',
|
128
|
+
userid: this.$login.f.id
|
129
|
+
}, {resolveMsg: null, rejectMsg: '获取片区出错!!!'})
|
130
|
+
let arr = getAllArea.data.filter((res) => {
|
131
|
+
return res.parentid == val
|
132
|
+
})
|
133
|
+
this.sliceArea = []
|
134
|
+
this.slice_area = []
|
135
|
+
arr.forEach((res) => {
|
136
|
+
this.sliceArea.push({label: res.name, value: {name: res.name, code:res.number}})
|
137
|
+
})
|
138
|
+
}
|
139
|
+
},
|
140
|
+
returnOrg(ids){
|
141
|
+
let limit = this.$login.r.includes('数据授权限定')
|
110
142
|
|
111
|
-
|
112
|
-
|
113
|
-
|
114
|
-
|
115
|
-
|
116
|
-
|
117
|
-
|
118
|
-
|
119
|
-
if(
|
120
|
-
|
121
|
-
|
122
|
-
|
123
|
-
|
124
|
-
|
125
|
-
|
126
|
-
},
|
127
|
-
getorg (obj) {
|
128
|
-
console.log("选中公司的数据11",obj.resids)
|
129
|
-
this.depresid=obj.resids
|
130
|
-
this.obj.orgnames = obj.res
|
131
|
-
this.initAreas(obj.resids)
|
132
|
-
this.returnOrg();
|
133
|
-
},
|
134
|
-
getdep(obj,val) {
|
135
|
-
console.log("选中部门的数据22",obj)
|
136
|
-
this.obj.depnames = val
|
137
|
-
this.userresid=obj
|
138
|
-
this.returnOrg();
|
139
|
-
},
|
140
|
-
getuser(obj) {
|
141
|
-
this.obj.operatornames = obj
|
142
|
-
console.log("选中用户的数据33",obj)
|
143
|
-
this.returnOrg(obj);
|
144
|
-
},
|
145
|
-
getarea(val) {
|
146
|
-
this.slice_area=val
|
147
|
-
console.log("选中的大区",val)
|
148
|
-
if(this.obj.operatornames){
|
149
|
-
this.returnOrg(this.obj.operatornames);
|
150
|
-
}else{
|
151
|
-
this.returnOrg();
|
143
|
+
let condition;
|
144
|
+
if(this.depresid.length > 0)
|
145
|
+
condition = " and f_orgid in " + plugin.convertToIn(this.depresid);
|
146
|
+
else
|
147
|
+
condition = " and f_orgid = " + this.$login.f.orgid;
|
148
|
+
if(this.userresid.length > 0){
|
149
|
+
condition += " and f_depid in " + plugin.convertToIn(this.userresid);
|
150
|
+
} else {
|
151
|
+
if (limit) {
|
152
|
+
let depids = []
|
153
|
+
for (let row of this.$refs.department.resoptions) {
|
154
|
+
depids.push(row.value)
|
155
|
+
}
|
156
|
+
let depid = depids.length ? plugin.convertToIn(depids) : ('')
|
157
|
+
condition += " and f_depid in " + depid;
|
152
158
|
}
|
153
159
|
}
|
160
|
+
if(ids && ids.length > 0){
|
161
|
+
condition += " and f_operatorid in " + plugin.convertToIn(ids);
|
162
|
+
}
|
163
|
+
if(this.slice_area.length>0){
|
164
|
+
condition += " and f_zones = '" + this.slice_area[0].name+"'"
|
165
|
+
}
|
166
|
+
this.$dispatch('re-res',condition,this.obj)
|
154
167
|
},
|
155
|
-
|
156
|
-
|
168
|
+
getorg (obj) {
|
169
|
+
this.depresid=obj.resids
|
170
|
+
this.obj.orgnames = obj.res
|
171
|
+
this.initAreas(obj.resids)
|
172
|
+
this.returnOrg();
|
173
|
+
},
|
174
|
+
getdep(obj,val) {
|
175
|
+
this.obj.depnames = val
|
176
|
+
this.userresid=obj
|
177
|
+
this.returnOrg();
|
178
|
+
},
|
179
|
+
getuser(obj) {
|
180
|
+
this.obj.operatornames = obj
|
181
|
+
this.returnOrg(obj);
|
182
|
+
},
|
183
|
+
getarea(val) {
|
184
|
+
this.slice_area=val
|
185
|
+
if(this.obj.operatornames){
|
186
|
+
this.returnOrg(this.obj.operatornames);
|
187
|
+
}else{
|
188
|
+
this.returnOrg();
|
189
|
+
}
|
157
190
|
}
|
191
|
+
},
|
192
|
+
watch: {
|
193
|
+
|
158
194
|
}
|
195
|
+
}
|
159
196
|
</script>
|