Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jfpt-Vue

shuishen

2021-03-20 ea805dacb11fff828e6d8c60983addf4017b67ee

Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jfpt-Vue

 src/permission.js

@@ -66,7 +66,12 @@
  NProgress.done();
  let title = store.getters.tag.label;
  let i18n = store.getters.tag.meta.i18n;
  title = router.$avueRouter.generateTitle(title, i18n)
  //title = router.$avueRouter.generateTitle(title, i18n)
  title = router.$avueRouter.generateTitle(title, i18n);
  //判断登录页的情况
     if (router.history.current.fullPath === "/login") {
       title = "登录";
     }
  //根据当前的标签也获取label的值动态设置浏览器标题
  router.$avueRouter.setTitle(title);
});

 src/views/clientManagement/clientManagement.vue

@@ -352,7 +352,8 @@
                  value: "1"
                }
              ]
            }, {
            },
            {
              label: "设备状态",
              align: "center",
              prop: "dxzt",
@@ -361,6 +362,18 @@
              editDisplay: false,
            },
            {
              label: "故障状态",
              prop: "state",
              addDisplay: false,
              editDisplay: false
            },
            {
              label: "故障原因",
              prop: "reason",
              addDisplay: false,
              editDisplay: false
            },
            {
              label: "设备类型",
              prop: "deviceType",
              width: 100,

 vue.config.js

@@ -34,8 +34,8 @@
        proxy: {
            '/api': {
                //本地服务接口地址
                target: 'http://192.168.1.125:82/',
                // target: 'https://web.byisf.com:18001/api/',
                //target: 'http://192.168.1.125:82/',
                target: 'https://web.byisf.com:18001/api/',
                //远程演示服务地址,可用于直接启动项目
                //target: 'https://saber.bladex.vip/api',
                ws: true,