朱兆平 / vue_cli · 提交

转到一个项目

作者 朱兆平
提交 d168cff770d742adef3ba7f0cb0c31a7d4fd7e9a 2 个父辈 26bdef13 219264f9

Merge branches 'hqpt_vue' and 'master' of 118.31.66.166:zp260/vue_cli 

 Conflicts:
	index.html
	src/api/user.js
	src/routes.js
	src/views/Home.vue
	src/views/nav1/Log.vue
	src/views/nav1/perm.vue
	src/views/nav1/role.vue
	src/views/nav1/user.vue
内嵌 并排对比
正在显示 10 个修改的文件 包含 28 行增加 和 28 行删除
@@ -34,4 +34,4 @@ export const add = params => { return axios({ @@ -34,4 +34,4 @@ export const add = params => { return axios({
34 headers: { 34 headers: {
35 'Content-Type': 'application/json;charset=UTF-8' 35 'Content-Type': 'application/json;charset=UTF-8'
36 } 36 }
37 -})};  
  37 +})};
@@ -34,4 +34,4 @@ export const add = params => { return axios({ @@ -34,4 +34,4 @@ export const add = params => { return axios({
34 headers: { 34 headers: {
35 'Content-Type': 'application/json;charset=UTF-8' 35 'Content-Type': 'application/json;charset=UTF-8'
36 } 36 }
37 -})};  
  37 +})};
@@ -34,4 +34,4 @@ export const add = params => { return axios({ @@ -34,4 +34,4 @@ export const add = params => { return axios({
34 headers: { 34 headers: {
35 'Content-Type': 'application/json;charset=UTF-8' 35 'Content-Type': 'application/json;charset=UTF-8'
36 } 36 }
37 -})};  
  37 +})};
1 import axios from 'axios' 1 import axios from 'axios'
2 2
3 -let base = '/hqpt-user-center/come_car'; 3 +let base = '/cloud-user-center/come_car';
4 4
5 5
6 6
@@ -35,4 +35,4 @@ export const add = params => { return axios({ @@ -35,4 +35,4 @@ export const add = params => { return axios({
35 headers: { 35 headers: {
36 'Content-Type': 'application/json;charset=UTF-8' 36 'Content-Type': 'application/json;charset=UTF-8'
37 } 37 }
38 -})};  
  38 +})};
1 import axios from 'axios' 1 import axios from 'axios'
2 2
3 -let base = '/hqpt-user-center/key'; 3 +let base = '/cloud-user-center/key';
4 4
5 5
6 6
@@ -35,4 +35,4 @@ export const add = params => { return axios({ @@ -35,4 +35,4 @@ export const add = params => { return axios({
35 headers: { 35 headers: {
36 'Content-Type': 'application/json;charset=UTF-8' 36 'Content-Type': 'application/json;charset=UTF-8'
37 } 37 }
38 -})};  
  38 +})};
1 import axios from 'axios' 1 import axios from 'axios'
2 2
3 -let base = '/hqpt-user-center/maintain'; 3 +let base = '/cloud-user-center/maintain';
4 4
5 5
6 6
@@ -35,4 +35,4 @@ export const add = params => { return axios({ @@ -35,4 +35,4 @@ export const add = params => { return axios({
35 headers: { 35 headers: {
36 'Content-Type': 'application/json;charset=UTF-8' 36 'Content-Type': 'application/json;charset=UTF-8'
37 } 37 }
38 -})};  
  38 +})};
1 import axios from 'axios' 1 import axios from 'axios'
2 2
3 -let base = '/hqpt-user-center/on_duty'; 3 +let base = '/cloud-user-center/on_duty';
4 4
5 5
6 6
@@ -35,4 +35,4 @@ export const add = params => { return axios({ @@ -35,4 +35,4 @@ export const add = params => { return axios({
35 headers: { 35 headers: {
36 'Content-Type': 'application/json;charset=UTF-8' 36 'Content-Type': 'application/json;charset=UTF-8'
37 } 37 }
38 -})};  
  38 +})};
1 import axios from 'axios' 1 import axios from 'axios'
2 2
3 -let base = '/hqpt-user-center/inspection'; 3 +let base = '/cloud-user-center/inspection';
4 4
5 5
6 6
@@ -35,4 +35,4 @@ export const add = params => { return axios({ @@ -35,4 +35,4 @@ export const add = params => { return axios({
35 headers: { 35 headers: {
36 'Content-Type': 'application/json;charset=UTF-8' 36 'Content-Type': 'application/json;charset=UTF-8'
37 } 37 }
38 -})};  
  38 +})};
1 import axios from 'axios' 1 import axios from 'axios'
2 2
3 -let base = '/hqpt-user-center/water_stations_patrol'; 3 +let base = '/cloud-user-center/water_stations_patrol';
4 4
5 5
6 6
@@ -35,4 +35,4 @@ export const add = params => { return axios({ @@ -35,4 +35,4 @@ export const add = params => { return axios({
35 headers: { 35 headers: {
36 'Content-Type': 'application/json;charset=UTF-8' 36 'Content-Type': 'application/json;charset=UTF-8'
37 } 37 }
38 -})};  
  38 +})};
@@ -15,28 +15,28 @@ @@ -15,28 +15,28 @@
15 </el-form> 15 </el-form>
16 </el-col> 16 </el-col>
17 <!--列表--> 17 <!--列表-->
18 - <el-table :data="logs" highlight-current-row v-loading="listLoading" @selection-change="selsChange" style="width: 100%;">  
19 - <el-table-column type="index" width="60"> 18 + <el-table :data="logs" highlight-current-row border v-loading="listLoading" @selection-change="selsChange" style="width: 100%;">
  19 + <el-table-column type="index" width="60" align="center">
20 </el-table-column> 20 </el-table-column>
21 - <el-table-column prop="logid" label="ID" width="80" sortable> 21 + <el-table-column prop="logid" label="ID" width="80" sortable align="center">
22 </el-table-column> 22 </el-table-column>
23 - <el-table-column prop="username" label="操作账号" width="120" sortable> 23 + <el-table-column prop="username" label="操作账号" width="120" sortable align="center">
24 </el-table-column> 24 </el-table-column>
25 - <el-table-column prop="ip" label="IP" width="100" sortable> 25 + <el-table-column prop="ip" label="IP" width="110" sortable align="center">
26 </el-table-column> 26 </el-table-column>
27 - <el-table-column prop="logcreattime" label="操作时间" width="200" sortable> 27 + <el-table-column prop="logcreattime" label="操作时间" width="200" sortable align="center">
28 </el-table-column> 28 </el-table-column>
29 - <el-table-column prop="methodname" label="系统动作" width="120" sortable> 29 + <el-table-column prop="methodname" label="系统动作" width="120" sortable align="center">
30 </el-table-column> 30 </el-table-column>
31 - <el-table-column prop="operatenamecn" label="动作描述" width="120" sortable> 31 + <el-table-column prop="operatenamecn" label="动作描述" width="120" sortable align="center">
32 </el-table-column> 32 </el-table-column>
33 - <el-table-column prop="modelnamecn" label="操作模块" width="120" sortable> 33 + <el-table-column prop="modelnamecn" label="操作模块" width="120" sortable align="center">
34 </el-table-column> 34 </el-table-column>
35 - <el-table-column prop="classname" label="系统类" show-overflow-tooltip width="100" sortable> 35 + <el-table-column prop="classname" label="系统类" show-overflow-tooltip width="100" sortable align="center">
36 </el-table-column> 36 </el-table-column>
37 - <el-table-column prop="parameters" label="参数" show-overflow-tooltip width="100" sortable> 37 + <el-table-column prop="parameters" label="参数" show-overflow-tooltip width="100" sortable align="center">
38 </el-table-column> 38 </el-table-column>
39 - <el-table-column prop="result" label="操作结果" min-width="200" sortable> 39 + <el-table-column prop="result" label="操作结果" min-width="200" sortable align="center">
40 </el-table-column> 40 </el-table-column>
41 </el-table> 41 </el-table>
42 42
@@ -124,4 +124,4 @@ @@ -124,4 +124,4 @@
124 124
125 <style scoped> 125 <style scoped>
126 126
127 -</style>  
  127 +</style>