From ea805dacb11fff828e6d8c60983addf4017b67ee Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Sat, 20 Mar 2021 09:47:59 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jfpt-Vue
---
src/permission.js | 7 ++++++-
vue.config.js | 4 ++--
src/views/clientManagement/clientManagement.vue | 15 ++++++++++++++-
3 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/src/permission.js b/src/permission.js
index 3f9b97d..d55aa37 100644
--- a/src/permission.js
+++ b/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);
});
diff --git a/src/views/clientManagement/clientManagement.vue b/src/views/clientManagement/clientManagement.vue
index 05a3797..20ee21e 100644
--- a/src/views/clientManagement/clientManagement.vue
+++ b/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,
diff --git a/vue.config.js b/vue.config.js
index 0aa983d..9f0126f 100644
--- a/vue.config.js
+++ b/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,
--
Gitblit v1.9.3