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

@@ -34,4 +34,4 @@ export const add = params => { return axios({
     headers: {
         'Content-Type': 'application/json;charset=UTF-8'
     }
-})};
\ No newline at end of file
+})};

@@ -34,4 +34,4 @@ export const add = params => { return axios({
     headers: {
         'Content-Type': 'application/json;charset=UTF-8'
     }
-})};
\ No newline at end of file
+})};

@@ -34,4 +34,4 @@ export const add = params => { return axios({
     headers: {
         'Content-Type': 'application/json;charset=UTF-8'
     }
-})};
\ No newline at end of file
+})};

 import axios from 'axios'
 
-let base = '/hqpt-user-center/come_car';
+let base = '/cloud-user-center/come_car';
 
 
 
@@ -35,4 +35,4 @@ export const add = params => { return axios({
     headers: {
         'Content-Type': 'application/json;charset=UTF-8'
     }
-})};
\ No newline at end of file
+})};

 import axios from 'axios'
 
-let base = '/hqpt-user-center/key';
+let base = '/cloud-user-center/key';
 
 
 
@@ -35,4 +35,4 @@ export const add = params => { return axios({
     headers: {
         'Content-Type': 'application/json;charset=UTF-8'
     }
-})};
\ No newline at end of file
+})};

 import axios from 'axios'
 
-let base = '/hqpt-user-center/maintain';
+let base = '/cloud-user-center/maintain';
 
 
 
@@ -35,4 +35,4 @@ export const add = params => { return axios({
     headers: {
         'Content-Type': 'application/json;charset=UTF-8'
     }
-})};
\ No newline at end of file
+})};

 import axios from 'axios'
 
-let base = '/hqpt-user-center/on_duty';
+let base = '/cloud-user-center/on_duty';
 
 
 
@@ -35,4 +35,4 @@ export const add = params => { return axios({
     headers: {
         'Content-Type': 'application/json;charset=UTF-8'
     }
-})};
\ No newline at end of file
+})};

 import axios from 'axios'
 
-let base = '/hqpt-user-center/inspection';
+let base = '/cloud-user-center/inspection';
 
 
 
@@ -35,4 +35,4 @@ export const add = params => { return axios({
     headers: {
         'Content-Type': 'application/json;charset=UTF-8'
     }
-})};
\ No newline at end of file
+})};

 import axios from 'axios'
 
-let base = '/hqpt-user-center/water_stations_patrol';
+let base = '/cloud-user-center/water_stations_patrol';
 
 
 
@@ -35,4 +35,4 @@ export const add = params => { return axios({
     headers: {
         'Content-Type': 'application/json;charset=UTF-8'
     }
-})};
\ No newline at end of file
+})};

@@ -15,28 +15,28 @@
             </el-form>
         </el-col>
         <!--列表-->
-        <el-table :data="logs" highlight-current-row v-loading="listLoading" @selection-change="selsChange" style="width: 100%;">
-            <el-table-column type="index" width="60">
+        <el-table :data="logs" highlight-current-row border v-loading="listLoading" @selection-change="selsChange" style="width: 100%;">
+            <el-table-column type="index" width="60" align="center">
             </el-table-column>
-            <el-table-column prop="logid" label="ID" width="80" sortable>
+            <el-table-column prop="logid" label="ID" width="80" sortable align="center">
             </el-table-column>
-            <el-table-column prop="username" label="操作账号" width="120" sortable>
+            <el-table-column prop="username" label="操作账号" width="120" sortable align="center">
             </el-table-column>
-            <el-table-column prop="ip" label="IP" width="100" sortable>
+            <el-table-column prop="ip" label="IP" width="110" sortable align="center">
             </el-table-column>
-            <el-table-column prop="logcreattime" label="操作时间" width="200" sortable>
+            <el-table-column prop="logcreattime" label="操作时间" width="200" sortable align="center">
             </el-table-column>
-            <el-table-column prop="methodname" label="系统动作" width="120" sortable>
+            <el-table-column prop="methodname" label="系统动作" width="120" sortable align="center">
             </el-table-column>
-            <el-table-column prop="operatenamecn" label="动作描述" width="120" sortable>
+            <el-table-column prop="operatenamecn" label="动作描述" width="120" sortable align="center">
             </el-table-column>
-            <el-table-column prop="modelnamecn" label="操作模块" width="120" sortable>
+            <el-table-column prop="modelnamecn" label="操作模块" width="120" sortable align="center">
             </el-table-column>
-            <el-table-column prop="classname" label="系统类" show-overflow-tooltip width="100" sortable>
+            <el-table-column prop="classname" label="系统类" show-overflow-tooltip width="100" sortable align="center">
             </el-table-column>
-            <el-table-column prop="parameters" label="参数" show-overflow-tooltip width="100" sortable>
+            <el-table-column prop="parameters" label="参数" show-overflow-tooltip width="100" sortable align="center">
             </el-table-column>
-            <el-table-column prop="result" label="操作结果" min-width="200" sortable>
+            <el-table-column prop="result" label="操作结果" min-width="200" sortable align="center">
             </el-table-column>
         </el-table>
 
@@ -124,4 +124,4 @@
 
 <style scoped>
 
-</style>
\ No newline at end of file
+</style>