朱兆平 / vue_cli · 提交

转到一个项目

作者 shenhailong
提交 2ad1561698dc9a10764149075924208cd60416d7 1 个父辈 0b407914

卡口分支

内嵌 并排对比
正在显示 4 个修改的文件 包含 43 行增加 和 303 行删除
1 import axios from 'axios' 1 import axios from 'axios'
2 2
3 -let base = '/cloud-user-center/perm';  
4 -// let base = '/cloud-kako-user-center/perm'; 3 +// let base = '/cloud-user-center/perm';
  4 +let base = '/cloud-kako-user-center/perm';
5 5
6 6
7 export const getList = params => { return axios.get(`${base}/list`, { params: params }); }; 7 export const getList = params => { return axios.get(`${base}/list`, { params: params }); };
1 import axios from 'axios' 1 import axios from 'axios'
2 2
3 -let base = '/cloud-user-center/role';  
4 -// let baseUrl = '/cloud-kako-user-center/role' 3 +// let base = '/cloud-user-center/role';
  4 +let base = '/cloud-kako-user-center/role'
5 5
6 6
7 export const getList = params => { return axios.get(`${base}/list`, { params: params }); }; 7 export const getList = params => { return axios.get(`${base}/list`, { params: params }); };
@@ -121,8 +121,6 @@ let routes = [ @@ -121,8 +121,6 @@ let routes = [
121 {path: '/main', component: Main, name: '首页'}, 121 {path: '/main', component: Main, name: '首页'},
122 ] 122 ]
123 }, 123 },
124 - // { path: '/test', component: Main },  
125 -  
126 { 124 {
127 path: '/', 125 path: '/',
128 component: Home, 126 component: Home,
@@ -133,41 +131,6 @@ let routes = [ @@ -133,41 +131,6 @@ let routes = [
133 { path: '/Page7', component: Page7, name: '申请添加' }, 131 { path: '/Page7', component: Page7, name: '申请添加' },
134 ] 132 ]
135 }, 133 },
136 -  
137 - {  
138 - path: '/domdep',  
139 - component: Home,  
140 - name: '订舱系统',  
141 - iconCls: 'el-icon-delete-location',  
142 - children: [  
143 - { path: '/booking', component: booking, name: '在线订舱' },  
144 - { path: '/order', component: order, name: '订舱信息' },  
145 - { path: '/airlift', component: airlift, name: '空运专线' },  
146 - ]  
147 - },  
148 -  
149 -  
150 -  
151 -  
152 - // 货运系统--航班预配  
153 - {  
154 - path: '/domdep',  
155 - component: Home,  
156 - name: '国内出港',  
157 - iconCls: 'el-icon-position',  
158 - children: [  
159 - { path: '/preConfiguration', component: preConfiguration, name: '航班预配' },  
160 - { path: '/allocate', component: allocate, name: '航班配载' },  
161 - { path: '/documents', component: documents, name: '航班文件' },  
162 - { path: '/charge', component: charge, name: '付费处理' },  
163 -  
164 - // { path: '/perm', component: Perm, name: '权限管理' },  
165 - // { path: '/log', component: LOG, name: '系统日志' },  
166 - // { path: '/department', component: Department, name: '部门管理' },  
167 - // { path: '/company', component: Company, name: '公司管理'},  
168 - // { path: '/group', component: Group, name: '集团管理'}  
169 - ]  
170 - },  
171 { 134 {
172 path: '/admin', 135 path: '/admin',
173 component: Home, 136 component: Home,
@@ -183,145 +146,7 @@ let routes = [ @@ -183,145 +146,7 @@ let routes = [
183 { path: '/group', component: Group, name: '集团管理'} 146 { path: '/group', component: Group, name: '集团管理'}
184 ] 147 ]
185 }, 148 },
186 - {  
187 - path: '/guestService',  
188 - component: Home,  
189 - name: '客服系统',  
190 - iconCls: 'fa fa-id-card-o',  
191 - children: [  
192 - { path: '/process', component: Process, name: '工单管理' },  
193 - { path: '/job', component: Job, name: '任务管理' },  
194 - {path: '/pre1', component: PreManifest, name: '预配'},  
195 - ]  
196 - },  
197 - {  
198 - path: '/output',  
199 - component: Home,  
200 - name: '出港业务申报',  
201 - iconCls: 'el-icon-collection',  
202 - children: [  
203 - {path: '/flight', component: ExitFlight, name: '出港航班申报'},  
204 - {path: '/manifest', component: ExitManifest, name: '出港运单申报'},  
205 - {path: '/pre', component: ExitPre, name: '出港预配舱单'},  
206 - {path: '/arrive', component: ExitArrive, name: '出港运抵'},  
207 - {path: '/loadingView', component: ExitFlightDesc, name: '出港航班信息'},  
208 - {path: '/loading', component: ExitLoading, name: '出港装载'},  
209 - {path: '/tidy', component: ExitTidy, name: '出港理货'}  
210 - ]  
211 - },  
212 - {  
213 - path: '/sec',  
214 - component: Home,  
215 - name: '安检清单申报管理',  
216 - iconCls: 'el-icon-collection',  
217 - children: [  
218 - {path: '/security', component: Security, name: '安检清单申报'}  
219 - ]  
220 - },  
221 - {  
222 - path: '/nmms2',  
223 - component: Home,  
224 - name: '进港业务申报',  
225 - iconCls: 'fa fa-id-card-o',  
226 - children: [  
227 - { path: '/orig', component: OrigFlightList, name: '进港航班申报' },  
228 - {path:'/waybill',component:Waybill,name:'进港运单申报'},  
229 - {path:'/allocateSearch',component:AllocateSearch,name:'运单分拨申报'},  
230 - { path: '/enter', component: EnterFlightInfo, name: '原始舱单'},  
231 - { path:'/origmaster',component:OrigMaster,name:'进港原始舱单'},  
232 - {path:'/entertall',component:EnterTally,name:'进港理货'},  
233 - {path:'/tallymaster',component:TallyMster,name:'进港理货舱单'},  
234 - {path:'/importallocation',component:Importallocation,name:'进港分拨'},  
235 - {path:'/allocatearrive',component:Allocatearrive,name:'分拨运抵'},  
236 - ]  
237 - },  
238 - // 货运系统--航班预配  
239 - {  
240 - path: '/flight_scheduling',  
241 - component: Home,  
242 - name: '航班计划',  
243 - iconCls: 'el-icon-delete-location',  
244 - children: [  
245 - { path: '/inquiry', component: inquiry, name: '航班计划查询' },  
246 - ]  
247 - },  
248 - {  
249 - path: '/lost',  
250 - component: Home,  
251 - name: '落装改配申报',  
252 - iconCls:'el-icon-goods',  
253 - children:[  
254 - {path:'/lostLoad',component:LostLoad,name:'落装业务申报'},  
255 - {path:'/lostLoadChange',component:LostLoadChange,name:'改配业务申报'}  
256 149
257 - ]  
258 - },  
259 - {  
260 - path: '/airtransport',  
261 - component: Home,  
262 - name: '通用业务申报',  
263 - iconCls:'el-icon-goods',  
264 - children:[  
265 - {path:'/route',component:Route,name:'航线申报'},  
266 - {path:'/bill',component:Bill,name:'单据申报'},  
267 - {path:'/flights',component:Flight,name:'航班申报'},  
268 - {path:'/flightplan',component:Flightplan,name:'当日飞行计划'},  
269 - {path:'/aircraft',component:Aircraft,name:'通用航空器申报'},  
270 - {path:'/routeaircraft',component:Routeaircraft,name:'航线航空器申报'},  
271 - ]  
272 - },  
273 - {  
274 - path: '/querytransport',  
275 - component: Home,  
276 - name: '通用业务查询',  
277 - iconCls:'el-icon-goods',  
278 - children:[  
279 - {path:'/queryRoute',component:queryRoute,name:'航线查询'},  
280 - {path:'/queryBill',component:queryBill,name:'单据查询'},  
281 - {path:'/queryFlights',component:queryFlight,name:'航班查询'},  
282 - {path:'/queryFlightplan',component:queryFlightplan,name:'当日飞行计划查询'},  
283 - {path:'/queryAircraft',component:queryAircraft,name:'通用航空器查询'},  
284 - {path:'/queryRouteaircraft',component:queryRouteaircraft,name:'航线航空器查询'},  
285 - ]  
286 - },  
287 - {  
288 - path: '/input',  
289 - component: Home,  
290 - name: '进港航班申报',  
291 - iconCls:'el-icon-goods',  
292 - children:[  
293 - {path:'/arrival',component:arrival,name:'进港预报申报'},  
294 - {path:'/confirmatory',component:confirmatory,name:'进港确报申报'},  
295 - {path:'/queryArrival',component:queryArrival,name:'进港预报查询'},  
296 - {path:'/queryConfirmatory',component:queryConfirmatory,name:'进港确报查询'},  
297 - {path:'/configure',component:configure,name:'进港航班配置'},  
298 - {path:'/queryConfigure',component:queryConfigure,name:'航班配置查询'},  
299 - ]  
300 - },  
301 - {  
302 - path: '/con',  
303 - component: Home,  
304 - name: '收发货人管理',  
305 - iconCls:'el-icon-goods',  
306 - children:[  
307 - {path:'/consigner',component:Consigner,name:'发货人管理'},  
308 - {path:'/consignee',component:Consignee,name:'收货人管理'},  
309 - ]  
310 - },  
311 - {  
312 - path: '/out',  
313 - component: Home,  
314 - name: '出港申报',  
315 - iconCls:'el-icon-goods',  
316 - children:[  
317 - {path:'/departure',component:departure,name:'出港预报申报'},  
318 - {path:'/declare',component:declare,name:'出港确报申报'},  
319 - {path:'/queryDeparture',component:queryDeparture,name:'出港预报查询'},  
320 - {path:'/queryDeclare',component:queryDeclare,name:'出港确报查询'},  
321 - {path:'/outConfigure',component:outConfigure,name:'出港航班配置'},  
322 - {path:'/queryFlightConfigure',component:queryFlightConfigure,name:'航班配置查询'},  
323 - ]  
324 - },  
325 { 150 {
326 path: '/', 151 path: '/',
327 component: Home, 152 component: Home,
@@ -334,43 +159,7 @@ let routes = [ @@ -334,43 +159,7 @@ let routes = [
334 ] 159 ]
335 }, 160 },
336 161
337 - {  
338 - path: '/empt',  
339 - component: Home,  
340 - name: '能源管理',  
341 - iconCls: 'fa fa-id-card-o',  
342 - children: [  
343 - { path: '/location', component: Location, name: '能源缴费' },  
344 162
345 - ]  
346 - },  
347 - {  
348 - path: '/satff',  
349 - component: Home,  
350 - name: '生活保障部门',  
351 - iconCls: 'fa fa-id-card-o',  
352 - children: [  
353 - { path: '/security_inspection', component: SecrityInspection, name: '职工公寓安全巡视管理' },  
354 - { path: '/key', component: Key, name: '职工公寓备用钥匙使用登记管理' },  
355 - { path: '/maintain', component: Maintain, name: '职工公寓设施设备维修记录管理' },  
356 - { path: '/come_car', component: ComeCar, name: '职工公寓外来人员车辆登记管理' },  
357 - { path: '/on_duty', component: OnDuty, name: '职工公寓值班巡视记录管理' },  
358 - ]  
359 - },  
360 - {  
361 - path: '/water_heating_chamber',  
362 - component: Home,  
363 - name: '水暖室',  
364 - iconCls: 'fa fa-address-card',  
365 - // leaf: true,//只有一个节点  
366 - children: [  
367 - { path: '/water_stations_patrol', component: WaterStationsPatrol, name: '二水厂-水站巡视记录单管理' },  
368 - // { path: '/page6', component: Page6, name: '水质量检测' },  
369 - // { path: '/page6', component: Page6, name: '污水站' },  
370 - // { path: '/page6', component: Page6, name: '一水厂' },  
371 - // { path: '/page6', component: Page6, name: '综合楼空调站' },  
372 - ]  
373 - },  
374 { 163 {
375 path: '/', 164 path: '/',
376 component: Home, 165 component: Home,
@@ -22,27 +22,21 @@ @@ -22,27 +22,21 @@
22 <el-table :data="users" highlight-current-row border v-loading="listLoading" @selection-change="selsChange" style="width: 100%;"> 22 <el-table :data="users" highlight-current-row border v-loading="listLoading" @selection-change="selsChange" style="width: 100%;">
23 <el-table-column type="selection" width="55"> 23 <el-table-column type="selection" width="55">
24 </el-table-column> 24 </el-table-column>
25 - <!--<el-table-column type="index" width="60">-->  
26 - <!--</el-table-column>-->  
27 - <el-table-column prop="userId" label="ID" width="100" sortable> 25 + <el-table-column prop="loginName" label="账号" width="120" sortable>
28 </el-table-column> 26 </el-table-column>
29 - <el-table-column prop="username" label="账号" width="120" sortable> 27 + <el-table-column prop="name" label="姓名" width="120" sortable>
30 </el-table-column> 28 </el-table-column>
31 - <el-table-column prop="realname" label="姓名" width="120" sortable> 29 + <el-table-column prop="mobile" label="电话" width="125">
32 </el-table-column> 30 </el-table-column>
33 - <el-table-column prop="sex" label="性别" width="100" :formatter="formatSex" sortable> 31 + <el-table-column prop="createDate" label="创建时间" width="170" sortable>
34 </el-table-column> 32 </el-table-column>
35 - <el-table-column prop="mobilephone" label="电话" width="125">  
36 - </el-table-column>  
37 - <el-table-column prop="creattime" label="创建时间" width="170" sortable>  
38 - </el-table-column>  
39 - <el-table-column prop="updatetime" label="更新时间" width="170" sortable> 33 + <el-table-column prop="updateDate" label="更新时间" width="170" sortable>
40 </el-table-column> 34 </el-table-column>
41 <el-table-column prop="address" label="地址" min-width="180"> 35 <el-table-column prop="address" label="地址" min-width="180">
42 </el-table-column> 36 </el-table-column>
43 <el-table-column prop="email" label="Email" min-width="180"> 37 <el-table-column prop="email" label="Email" min-width="180">
44 </el-table-column> 38 </el-table-column>
45 - <el-table-column prop="state" label="启用" width="100" :formatter="formatState" sortable> 39 + <el-table-column prop="loginFlag" label="启用" width="100" :formatter="formatState" sortable>
46 </el-table-column> 40 </el-table-column>
47 <el-table-column label="操作" width="250"> 41 <el-table-column label="操作" width="250">
48 <template slot-scope="scope"> 42 <template slot-scope="scope">
@@ -75,57 +69,32 @@ @@ -75,57 +69,32 @@
75 </el-select> 69 </el-select>
76 </el-form-item> 70 </el-form-item>
77 <el-form-item label="ID"> 71 <el-form-item label="ID">
78 - <span>{{editForm.userId}}</span> 72 + <span>{{editForm.id}}</span>
79 </el-form-item> 73 </el-form-item>
80 <el-form-item label="账号"> 74 <el-form-item label="账号">
81 - <span>{{editForm.username}}</span> 75 + <span>{{editForm.loginName}}</span>
82 </el-form-item> 76 </el-form-item>
83 <el-form-item label="密码" prop="password"> 77 <el-form-item label="密码" prop="password">
84 <el-input v-model="editForm.password" auto-complete="off" type="password" show-password></el-input> 78 <el-input v-model="editForm.password" auto-complete="off" type="password" show-password></el-input>
85 </el-form-item> 79 </el-form-item>
86 - <el-form-item label="姓名" prop="realname">  
87 - <el-input v-model="editForm.realname" auto-complete="off"></el-input> 80 + <el-form-item label="姓名" prop="name">
  81 + <el-input v-model="editForm.name" auto-complete="off"></el-input>
88 </el-form-item> 82 </el-form-item>
89 - <el-form-item label="电话" prop="mobilephone">  
90 - <el-input v-model="editForm.mobilephone" auto-complete="off"></el-input> 83 + <el-form-item label="电话" prop="mobile">
  84 + <el-input v-model="editForm.mobile" auto-complete="off"></el-input>
91 </el-form-item> 85 </el-form-item>
92 <el-form-item label="Email" prop="email"> 86 <el-form-item label="Email" prop="email">
93 <el-input v-model="editForm.email" auto-complete="off"></el-input> 87 <el-input v-model="editForm.email" auto-complete="off"></el-input>
94 </el-form-item> 88 </el-form-item>
95 - <el-form-item label="性别">  
96 - <el-radio-group v-model="editForm.sex">  
97 - <el-radio class="radio" label="1" >男</el-radio>  
98 - <el-radio class="radio" label="0" >女</el-radio>  
99 - </el-radio-group>  
100 - </el-form-item>  
101 - <el-form-item label="年龄">  
102 - <el-input-number v-model="editForm.age" :min="0" :max="200"></el-input-number>  
103 - </el-form-item>  
104 - <!--<el-form-item label="创建日期">-->  
105 - <!--<el-date-picker type="date" placeholder="创建日期" v-model="editForm.creattime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss"></el-date-picker>-->  
106 - <!--</el-form-item>-->  
107 <el-form-item label="地址"> 89 <el-form-item label="地址">
108 <el-input type="textarea" v-model="editForm.address"></el-input> 90 <el-input type="textarea" v-model="editForm.address"></el-input>
109 </el-form-item> 91 </el-form-item>
110 <el-form-item label="启用"> 92 <el-form-item label="启用">
111 - <el-radio-group v-model="editForm.state">  
112 - <el-radio class="radio" label="true" >是</el-radio>  
113 - <el-radio class="radio" label="false" >否</el-radio> 93 + <el-radio-group v-model="editForm.loginFlag">
  94 + <el-radio class="radio" label="1" >是</el-radio>
  95 + <el-radio class="radio" label="0" >否</el-radio>
114 </el-radio-group> 96 </el-radio-group>
115 </el-form-item> 97 </el-form-item>
116 - <el-form-item lable="头像">  
117 - <el-upload  
118 - class="avatar-uploader"  
119 - action="http://127.0.0.1:7003/upload"  
120 - :show-file-list="true"  
121 - accept="image/jpeg,image/jpg,image/png"  
122 - :on-success="handleAvatarSuccess"  
123 - :before-upload="beforeAvatarUpload"  
124 - >  
125 - <img v-if="faceImageUrl" :src="faceImageUrl" class="avatar">  
126 - <i v-else class="el-icon-plus avatar-uploader-icon"></i>  
127 - </el-upload>  
128 - </el-form-item>  
129 </el-form> 98 </el-form>
130 <div slot="footer" class="dialog-footer"> 99 <div slot="footer" class="dialog-footer">
131 <el-button @click.native="editFormVisible = false">取消</el-button> 100 <el-button @click.native="editFormVisible = false">取消</el-button>
@@ -147,30 +116,21 @@ @@ -147,30 +116,21 @@
147 </el-option> 116 </el-option>
148 </el-select> 117 </el-select>
149 </el-form-item> 118 </el-form-item>
150 - <el-form-item label="账号" prop="username">  
151 - <el-input v-model="addForm.username" aria-placeholder="用户名长度在5-11位,支持英文和数字"></el-input> 119 + <el-form-item label="账号" prop="loginName">
  120 + <el-input v-model="addForm.loginName" aria-placeholder="用户名长度在5-11位,支持英文和数字"></el-input>
152 </el-form-item> 121 </el-form-item>
153 <el-form-item label="密码" prop="password"> 122 <el-form-item label="密码" prop="password">
154 <el-input v-model="addForm.password" type="password"></el-input> 123 <el-input v-model="addForm.password" type="password"></el-input>
155 </el-form-item> 124 </el-form-item>
156 - <el-form-item label="姓名" prop="realname">  
157 - <el-input v-model="addForm.realname"></el-input> 125 + <el-form-item label="姓名" prop="name">
  126 + <el-input v-model="addForm.name"></el-input>
158 </el-form-item> 127 </el-form-item>
159 - <el-form-item label="电话" prop="mobilephone">  
160 - <el-input v-model="addForm.mobilephone"></el-input> 128 + <el-form-item label="电话" prop="mobile">
  129 + <el-input v-model="addForm.mobile"></el-input>
161 </el-form-item> 130 </el-form-item>
162 <el-form-item label="Email" prop="email"> 131 <el-form-item label="Email" prop="email">
163 <el-input v-model="addForm.email"></el-input> 132 <el-input v-model="addForm.email"></el-input>
164 </el-form-item> 133 </el-form-item>
165 - <el-form-item label="性别">  
166 - <el-radio-group v-model="addForm.sex">  
167 - <el-radio class="radio" label="1">男</el-radio>  
168 - <el-radio class="radio" label="0">女</el-radio>  
169 - </el-radio-group>  
170 - </el-form-item>  
171 - <el-form-item label="年龄" prop="age">  
172 - <el-input-number v-model="addForm.age" :min="0" :max="200"></el-input-number>  
173 - </el-form-item>  
174 <el-form-item label="地址"> 134 <el-form-item label="地址">
175 <el-input type="textarea" v-model="addForm.address"></el-input> 135 <el-input type="textarea" v-model="addForm.address"></el-input>
176 </el-form-item> 136 </el-form-item>
@@ -237,17 +197,15 @@ @@ -237,17 +197,15 @@
237 }, 197 },
238 //编辑界面数据 198 //编辑界面数据
239 editForm: { 199 editForm: {
240 - userId: 1,  
241 - username: '', 200 + loginName: '',
242 password: '', 201 password: '',
243 - sex: 1,  
244 - creattime: '',  
245 - address: '',  
246 - realname: '', 202 + name: '',
  203 + address: '',
247 email: '', 204 email: '',
248 - mobilephone: '',  
249 - state: 'true',  
250 - companyId:'' 205 + mobile: '',
  206 + id: '',
  207 + companyId:'',
  208 + loginFlag: ''
251 }, 209 },
252 210
253 addFormVisible: false,//新增界面是否显示 211 addFormVisible: false,//新增界面是否显示
@@ -267,14 +225,12 @@ @@ -267,14 +225,12 @@
267 roleFormVisible: false, 225 roleFormVisible: false,
268 //新增界面数据 226 //新增界面数据
269 addForm: { 227 addForm: {
270 - username: '',  
271 - password: '',  
272 - sex: 1,  
273 - address: '',  
274 - realname: '',  
275 - email: '',  
276 - mobilephone: '',  
277 - age: 1, 228 + loginName: '',
  229 + password: '',
  230 + name: '',
  231 + address: '',
  232 + email: '',
  233 + mobile: '',
278 companyId:'' 234 companyId:''
279 }, 235 },
280 roleEditForm: { 236 roleEditForm: {
@@ -290,11 +246,8 @@ @@ -290,11 +246,8 @@
290 }, 246 },
291 methods: { 247 methods: {
292 //性别显示转换 248 //性别显示转换
293 - formatSex: function (row, column) {  
294 - return row.sex == 1 ? '男' : row.sex == 0 ? '女' : '未知';  
295 - },  
296 formatState: function (row, column) { 249 formatState: function (row, column) {
297 - return row.state == true ? '是' : row.state == false ? '否' : '未知'; 250 + return row.loginFlag == '1' ? '启用' : row.loginFlag == '0' ? '禁用' : '未知';
298 }, 251 },
299 handleCurrentChange(val) { 252 handleCurrentChange(val) {
300 this.pageNum = val; 253 this.pageNum = val;
@@ -342,7 +295,7 @@ @@ -342,7 +295,7 @@
342 }).then(() => { 295 }).then(() => {
343 this.listLoading = true; 296 this.listLoading = true;
344 //NProgress.start(); 297 //NProgress.start();
345 - let para = { userId: row.userId }; 298 + let para = { userId: row.id };
346 removeUser(para).then((res) => { 299 removeUser(para).then((res) => {
347 this.listLoading = false; 300 this.listLoading = false;
348 //NProgress.done(); 301 //NProgress.done();
@@ -411,14 +364,12 @@ @@ -411,14 +364,12 @@
411 handleAdd: function () { 364 handleAdd: function () {
412 this.addFormVisible = true; 365 this.addFormVisible = true;
413 this.addForm = { 366 this.addForm = {
414 - username: '', 367 + loginName: '',
415 password: '', 368 password: '',
416 - sex: 1, 369 + name: '',
417 address: '', 370 address: '',
418 - realname: '',  
419 email: '', 371 email: '',
420 - mobilephone: '',  
421 - age: 1, 372 + mobile: '',
422 companyId:'' 373 companyId:''
423 }; 374 };
424 }, 375 },