Merge remote-tracking branch 'origin/master'

src/utils/request.js

@@ -15,7 +15,7 @@ const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   baseURL: process.env.VUE_APP_BASE_API,
   // 超时
-  timeout: 10000
+  timeout: 20000
 })
 
 // request拦截器

src/views/data-statistics/echars-components/china-map.vue

@@ -88,9 +88,9 @@ export default {
             const unit = _this.unit
             let percent = 0
             if (item.data.value !== '0') {
-              percent = (item.data.value / _this.sum * 100).toFixed(1)
+              percent = (item.data.value / _this.sum * 100).toFixed(0)
             } else {
-              percent = percent.toFixed(1)
+              percent = percent.toFixed(0)
             }
             return `<div>
                 ${item.data.name}

src/views/equipment-management/equipment-management/equipment-management.vue

@@ -156,7 +156,7 @@
           <span>{{ scope.row.phone || "-" }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="设备类型" align="left" prop="deviceType" show-overflow-tooltip>
+      <el-table-column label="设备类型" align="left" prop="deviceType" min-width="100"  show-overflow-tooltip>
         <template slot-scope="scope">
           <span v-if="scope.row.deviceType=== null||scope.row.deviceType=== '' ">{{ "-" }}</span>
           <span v-else>