运维

src/layout/components/Navbar.vue

@@ -85,8 +85,8 @@ export default {
     //菜单路由
     menuList(){
       //console.log(this.permission_routes);
-      // this.PermissionList = this.permission_routes.slice(5, 11);
-      this.PermissionList = this.permission_routes.slice(5, 9);
+       this.PermissionList = this.permission_routes.slice(5, 11);
+      //this.PermissionList = this.permission_routes.slice(5, 9);
     },
     //当前时间
     timer() {

src/views/equipment-monitoring/components/StorageInfo.vue

@@ -48,8 +48,22 @@ import BatteryStatus from "./BatteryStatus.vue";
 import BatteryCharger from "./BatteryCharger.vue"
 export default {
     name:"StorageInfo",
-    props:['storeCode','comState','sn','soc','chgEstimatedTime','current','voltage','minTemperature','maxTemperature','maxCellVoltage','minCellVoltage',
-        'soh','storeState','chargerInfoVo'],
+    props:[
+        'storeCode',
+        'comState',
+        'sn',
+        'soc',
+        'chgEstimatedTime',
+        'current',
+        'voltage',
+        'minTemperature',
+        'maxTemperature',
+        'maxCellVoltage',
+        'minCellVoltage',
+        'soh',
+        'storeState',
+        'chargerInfoVo'
+    ],
     components: {
         BatteryInfo,
         BatteryStatus,

src/views/manage-log/robot.vue

@@ -174,12 +174,11 @@ export default {
       queryParams: {
         page: 1, // 当前页
         pageSize: 10, // 每页条数
-        chargerId: undefined, 
-        chgSn: undefined, // 电池编号
-        chgBeginTime: undefined,
-        chgEndTime: undefined,
-        orderByField: undefined, // 排序字段
-        orderByWays: 'desc'// 排序方式
+        deviceNo: undefined, 
+        endTime: undefined, // 电池编号
+        signals: undefined, // 排序字段
+        startTime: undefined,// 排序方式
+        sort:1
       },
       total: 0, // 总条数，
       tableheight: 0, // 表格高度设置
@@ -261,10 +260,9 @@ export default {
     },
     //获取机器人日志列表
     getrobotList(){
-      const params={}
-      robotList(params).then( res =>{
+      robotList(this.queryParams).then( res =>{
         console.log(res)
-        this.datalist= res.data
+        this.datalist= res.data.list
       })
     },
     //获取日志数据字典

vue.config.js

@@ -21,19 +21,19 @@ module.exports = {
     },
     proxy: {
       '/api': {
-        target: `http://192.168.3.177:8080`,
+        target: `http://192.168.2.43:8080`,
         // target: `http://172.16.12.146:8080`,
         ws: true,
         changeOrigin: true,
       },
       '/ws': {
-         target: `ws://192.168.3.177:8080/ws`,
+         target: `ws://192.168.2.43:8080/ws`,
         // target: `ws://172.16.12.146:8080/ws`,
         ws: true,
         changeOrigin: true,
       },
       '/video':{
-        target: `ws://192.168.3.177:8082/`,
+        target: `ws://192.168.2.43:8082/`,
         // target: `ws://172.16.12.146:8080/ws`,
         ws: true,
         changeOrigin: true,