base_url地址更改，表格单元格增加tip

@@ -4,8 +4,8 @@ const prodEnv = require('./prod.env')
 
 
 module.exports = merge(prodEnv, {
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
   NODE_ENV: '"development"',
-  BASE_API: '"http://127.0.0.1:9095"',
-  // BASE_API_other: '"https://192.168.0.69:8080"'
-  BASE_API_other: '"http://192.168.0.75:8080"'
+  BASE_API: '"http://192.168.1.50:9095"',
+  // MONITOR_GATEWAY: '"https://192.168.0.69:8080"'
+  MONITOR_GATEWAY: '"http://192.168.1.50:8080"'
   // BASE_API: '"http://10.108.26.197:9095"'
   // BASE_API: '"http://10.108.26.197:9095"'
 })
 })

@@ -3,5 +3,5 @@ module.exports = {
   NODE_ENV: '"production"',
   NODE_ENV: '"production"',
   // 青海现场环境配置
   // 青海现场环境配置
   BASE_API: '"http://95.12.89.134:8089"',
   BASE_API: '"http://95.12.89.134:8089"',
-  BASE_API_other: '"http://95.12.89.134:8080"'
+  MONITOR_GATEWAY: '"http://95.12.89.134:8080"'
 }
 }

@@ -13,7 +13,7 @@ import axios from 'axios';
 //性能趋势图路径
 //性能趋势图路径
 
 
 export function getTrendBaseUrl() {
 export function getTrendBaseUrl() {
-  let baseUrl=process.env.BASE_API_other;
+  let baseUrl=process.env.MONITOR_GATEWAY;
   // baseUrl='http://localhost:8088';
   // baseUrl='http://localhost:8088';
   return baseUrl;
   return baseUrl;
 }
 }

@@ -4,7 +4,7 @@ import store from '../store'
 import { getToken } from '@/utils/auth'
 import { getToken } from '@/utils/auth'
 // 创建axios实例
 // 创建axios实例
 const service = axios.create({
 const service = axios.create({
-  baseURL: process.env.BASE_API_other, // api 的 base_url
+  baseURL: process.env.MONITOR_GATEWAY, // api 的 base_url
   timeout: 20000 // 请求超时时间
   timeout: 20000 // 请求超时时间
 })
 })
 
 

@@ -19,14 +19,21 @@
           <ul class="infoList">
           <ul class="infoList">
             <li v-for="(item, index) in list" :key="index" :style="tableRowHeight()" >
             <li v-for="(item, index) in list" :key="index" :style="tableRowHeight()" >
               <div
               <div
+                class="text-overflow"
                 v-for="(itemChild, idx) in header"
                 v-for="(itemChild, idx) in header"
                 :key="idx"
                 :key="idx"
                 :style="[bodyTableStyle, bodyTable(index),tableFiledWidth(idx),tableRowHeight()]"
                 :style="[bodyTableStyle, bodyTable(index),tableFiledWidth(idx),tableRowHeight()]"
               >
               >
-                <span v-if="itemChild.key=='alarmLevel' && item[itemChild.key]=='1'" :class="['table-level-normal',{'table-level-worse':item[itemChild.key]=='2','table-level-worst':item[itemChild.key]=='3'}]" >一般</span>
-                <span v-else-if="itemChild.key=='alarmLevel' && item[itemChild.key]=='2'" :class="['table-level-normal',{'table-level-worse':item[itemChild.key]=='2','table-level-worst':item[itemChild.key]=='3'}]" >重要</span>
-                <span v-else-if="itemChild.key=='alarmLevel' && item[itemChild.key]=='3'" :class="['table-level-normal',{'table-level-worse':item[itemChild.key]=='2','table-level-worst':item[itemChild.key]=='3'}]" >严重</span>
-                <span v-else>{{ item[itemChild.key] }}</span>
+                <el-tooltip   ref="elTooltip" trigger="hover" >
+                  <template #content>
+                    <span>{{ item[itemChild.key] }}</span>
+                  </template>
+                  <span v-if="itemChild.key=='alarmLevel' && item[itemChild.key]=='1'" :class="['table-level-normal',{'table-level-worse':item[itemChild.key]=='2','table-level-worst':item[itemChild.key]=='3'}]" >一般</span>
+                  <span v-else-if="itemChild.key=='alarmLevel' && item[itemChild.key]=='2'" :class="['table-level-normal',{'table-level-worse':item[itemChild.key]=='2','table-level-worst':item[itemChild.key]=='3'}]" >重要</span>
+                  <span v-else-if="itemChild.key=='alarmLevel' && item[itemChild.key]=='3'" :class="['table-level-normal',{'table-level-worse':item[itemChild.key]=='2','table-level-worst':item[itemChild.key]=='3'}]" >严重</span>
+                  <span v-else>{{ item[itemChild.key] }}</span>
+                </el-tooltip>
+
               </div>
               </div>
             </li>
             </li>
           </ul>
           </ul>
@@ -60,7 +67,7 @@ export default {
   },
   },
   data() {
   data() {
     return {
     return {
-      currentPage:0,
+      currentPage:1,
       pageSize:10,
       pageSize:10,
       pageSizes:[10,50,100, 200, 300, 400],
       pageSizes:[10,50,100, 200, 300, 400],
       total:20,
       total:20,
@@ -266,14 +273,14 @@ export default {
     // 切换页码
     // 切换页码
     prePage(val) {
     prePage(val) {
       // props.currentPage = val - 1;
       // props.currentPage = val - 1;
-      this.currentPage = val-1;
+      this.currentPage = val;
       this.handleTableData();
       this.handleTableData();
     },
     },
 
 
     // 切换页码
     // 切换页码
     nextPage(val){
     nextPage(val){
       // props.currentPage = val + 1;
       // props.currentPage = val + 1;
-      this.currentPage = val+1;
+      this.currentPage = val;
       this.handleTableData();
       this.handleTableData();
     },
     },
     //分页获取表格数据
     //分页获取表格数据
@@ -347,6 +354,18 @@ export default {
 .table-level-worst {
 .table-level-worst {
   background-color: #D81E06;
   background-color: #D81E06;
 }
 }
+.text-overflow{
+  white-space:nowrap;
+  overflow:hidden;
+  text-overflow:ellipsis;
+
+  /*word-break: break-all;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  display: -webkit-box;
+  -webkit-line-clamp: 2;
+  -webkit-box-orient: vertical;*/
+}
 /*.txtScroll-top .infoList li:nth-child(n) {
 /*.txtScroll-top .infoList li:nth-child(n) {
   background: rgb(0, 59, 81);
   background: rgb(0, 59, 81);
 }
 }