diff --git a/src/main.ts b/src/main.ts
index 9f45582..07c50a2 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -36,12 +36,18 @@
}
directive(app)
-axios.get('./config/config.json').then((result) => {
+axios.get('./config/config.json', {
+ headers: {
+ 'Cache-Control': 'no-cache',
+ },
+}).then((result) => {
console.log('get config')
console.log(result)
+ window.localStorage.setItem('url-bj-well', result.data.baseUrl)
+ window.localStorage.setItem('securityJsCode', result.data.securityJsCode)
+ window.localStorage.setItem('JsKey', result.data.JsKey)
request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址
app.config.globalProperties.config = result.data
- window.localStorage.setItem('url-bj-well', result.data.baseUrl)
app.mount('#app')
}).catch((error) => {
console.error(`get baseConfig error...${error}`)
diff --git a/src/router/modules/home.ts b/src/router/modules/home.ts
index c853fca..73bfa05 100644
--- a/src/router/modules/home.ts
+++ b/src/router/modules/home.ts
@@ -13,7 +13,7 @@
meta: {
title: '首页',
icon: 'ep:key',
- // auth: '/home',
+ auth: '/dashboard',
},
children: [
{
@@ -26,7 +26,7 @@
sidebar: false,
breadcrumb: false,
activeMenu: '/home',
- // auth: '/home',
+ auth: '/dashboard',
},
},
],
@@ -51,7 +51,7 @@
meta: {
title: '报警管理',
icon: 'ep:key',
- // auth: '/alarm',
+ auth: '/alarm',
},
children: [
{
@@ -64,7 +64,7 @@
sidebar: true,
breadcrumb: true,
activeMenu: '/alarm/current',
- // auth: '/alarm/current',
+ auth: '/alarm/current',
},
},
{
@@ -77,7 +77,7 @@
sidebar: true,
breadcrumb: true,
activeMenu: '/alarm/history',
- // auth: '/alarm/history',
+ auth: '/alarm/history',
},
},
{
@@ -90,7 +90,7 @@
sidebar: true,
breadcrumb: true,
activeMenu: '/alarm/count',
- // auth: '/alarm/count',
+ auth: '/alarm/count',
},
},
],
@@ -103,7 +103,7 @@
meta: {
title: '闸井监测',
icon: 'ep:key',
- // auth: '/well',
+ auth: '/well',
},
children: [
{
@@ -116,7 +116,7 @@
sidebar: false,
breadcrumb: false,
activeMenu: '/well',
- // auth: '/well',
+ auth: '/well',
},
},
],
@@ -129,7 +129,7 @@
meta: {
title: '场站监测',
icon: 'ep:key',
- // auth: '/station',
+ auth: '/station',
},
children: [
{
@@ -142,7 +142,7 @@
sidebar: true,
breadcrumb: true,
activeMenu: '/station/monitor',
- // auth: '/station/monitor',
+ auth: '/station/monitor',
},
},
{
@@ -155,7 +155,7 @@
sidebar: true,
breadcrumb: true,
activeMenu: '/station/video',
- // auth: '/station/video',
+ auth: '/station/video',
},
},
{
@@ -168,7 +168,7 @@
sidebar: true,
breadcrumb: true,
activeMenu: '/station/control',
- // auth: '/station/control',
+ auth: '/station/control',
},
},
],
@@ -181,7 +181,7 @@
meta: {
title: '管线监测',
icon: 'ep:key',
- // auth: '/pipeline',
+ auth: '/pipeline',
},
children: [
{
@@ -194,7 +194,7 @@
sidebar: false,
breadcrumb: false,
activeMenu: '/pipeline',
- // auth: '/pipeline',
+ auth: '/pipeline',
},
},
],
@@ -207,7 +207,7 @@
meta: {
title: '台账管理',
icon: 'ep:key',
- // auth: '/ledger',
+ auth: '/ledger',
},
children: [
{
@@ -220,7 +220,7 @@
sidebar: false,
breadcrumb: false,
activeMenu: '/ledger',
- // auth: '/ledger',
+ auth: '/ledger',
},
},
],
@@ -233,7 +233,7 @@
meta: {
title: '设备管理',
icon: 'ep:key',
- // auth: '/device',
+ auth: '/device',
},
children: [
{
@@ -246,7 +246,7 @@
sidebar: true,
breadcrumb: true,
activeMenu: '/device/type',
- // auth: '/device/type',
+ auth: '/device/type',
},
},
{
@@ -259,7 +259,7 @@
sidebar: true,
breadcrumb: true,
activeMenu: '/device/product',
- // auth: '/device/product',
+ auth: '/device/product',
},
},
{
@@ -272,7 +272,7 @@
sidebar: true,
breadcrumb: true,
activeMenu: '/device/manage',
- // auth: '/device/manage',
+ auth: '/device/manage',
},
},
{
@@ -285,7 +285,7 @@
sidebar: true,
breadcrumb: true,
activeMenu: '/device/operation',
- // auth: '/device/operation',
+ auth: '/device/operation',
},
},
{
@@ -298,7 +298,7 @@
sidebar: true,
breadcrumb: true,
activeMenu: '/device/instruction',
- // auth: '/device/instruction',
+ auth: '/device/instruction',
},
},
{
@@ -311,7 +311,7 @@
sidebar: true,
breadcrumb: true,
activeMenu: '/device/count',
- // auth: '/device/count',
+ auth: '/device/count',
},
},
],
@@ -324,7 +324,7 @@
meta: {
title: '规则引擎',
icon: 'ep:key',
- // auth: '/rule',
+ auth: '/rule',
},
children: [
{
@@ -337,7 +337,7 @@
sidebar: true,
breadcrumb: true,
activeMenu: '/rule/agreement',
- // auth: '/rule/agreement',
+ auth: '/rule/agreement',
},
},
{
@@ -350,7 +350,7 @@
sidebar: true,
breadcrumb: true,
activeMenu: '/rule/alarm',
- // auth: '/rule/alarm',
+ auth: '/rule/alarm',
},
},
],
diff --git a/src/views/system/user/userAdd.vue b/src/views/system/user/userAdd.vue
index d9be3d1..a25c989 100644
--- a/src/views/system/user/userAdd.vue
+++ b/src/views/system/user/userAdd.vue
@@ -26,7 +26,7 @@
rePassword: '', // 重复密码
birthday: '',
sex: '', // 性别
- attr1: '', // 人员类别
+ // attr1: '', // 人员类别
})// 表单
const deptProps = reactive({
parent: 'pid', value: 'id', label: 'name', children: 'children',
@@ -73,7 +73,7 @@
roleid: [{ required: true, message: '角色必选', trigger: ['blur', 'change'] }],
email: [{ required: false, message: '请输入邮箱地址', trigger: 'blur' }, { type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change'] }],
phone: [{ required: false, pattern: /^1[34578]\d{9}$/, message: '请输入正确的手机号', trigger: ['blur', 'change'] }],
- attr1: [{ required: true, message: '人员类别必选', trigger: ['blur', 'change'] }],
+ // attr1: [{ required: true, message: '人员类别必选', trigger: ['blur', 'change'] }],
})// 前端校验规则
const roleName = ref()// 角色名，展示用
const btnLoading = ref(false)// 保存按钮的加载中状态
@@ -313,7 +313,7 @@
-
+