diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3dfbab9..87c30b8 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -27,7 +27,7 @@
dayjs: ^1.11.6
echarts: ^5.4.1
echarts-gl: ^2.0.8
- element-plus: ^2.7.8
+ element-plus: ^2.9.7
eslint: ^8.27.0
esno: ^0.16.3
file-saver: ^2.0.5
@@ -95,7 +95,7 @@
dayjs: 1.11.13
echarts: 5.5.1
echarts-gl: 2.0.9_echarts@5.5.1
- element-plus: 2.9.1_vue@3.5.13
+ element-plus: 2.9.7_vue@3.5.13
file-saver: 2.0.5
hotkeys-js: 3.13.9
html2canvas: 1.4.1
@@ -3335,8 +3335,8 @@
resolution: {integrity: sha512-CjVQyG7n7Sr+eBXE86HIulnL5N8xZY1sgmOPGuq/F0Rr0FJq63lg0kEtOIDfZBk44FnDLf6FUJ+dsJcuiUDdDQ==}
dev: true
- /element-plus/2.9.1_vue@3.5.13:
- resolution: {integrity: sha512-9Agqf/jt4Ugk7EZ6C5LME71sgkvauPCsnvJN12Xid2XVobjufxMGpRE4L7pS4luJMOmFAH3J0NgYEGZT5r+NDg==}
+ /element-plus/2.9.7_vue@3.5.13:
+ resolution: {integrity: sha512-6vjZh5SXBncLhUwJGTVKS5oDljfgGMh6J4zVTeAZK3YdMUN76FgpvHkwwFXocpJpMbii6rDYU3sgie64FyPerQ==}
peerDependencies:
vue: ^3.2.0
dependencies:
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3dfbab9..87c30b8 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -27,7 +27,7 @@
dayjs: ^1.11.6
echarts: ^5.4.1
echarts-gl: ^2.0.8
- element-plus: ^2.7.8
+ element-plus: ^2.9.7
eslint: ^8.27.0
esno: ^0.16.3
file-saver: ^2.0.5
@@ -95,7 +95,7 @@
dayjs: 1.11.13
echarts: 5.5.1
echarts-gl: 2.0.9_echarts@5.5.1
- element-plus: 2.9.1_vue@3.5.13
+ element-plus: 2.9.7_vue@3.5.13
file-saver: 2.0.5
hotkeys-js: 3.13.9
html2canvas: 1.4.1
@@ -3335,8 +3335,8 @@
resolution: {integrity: sha512-CjVQyG7n7Sr+eBXE86HIulnL5N8xZY1sgmOPGuq/F0Rr0FJq63lg0kEtOIDfZBk44FnDLf6FUJ+dsJcuiUDdDQ==}
dev: true
- /element-plus/2.9.1_vue@3.5.13:
- resolution: {integrity: sha512-9Agqf/jt4Ugk7EZ6C5LME71sgkvauPCsnvJN12Xid2XVobjufxMGpRE4L7pS4luJMOmFAH3J0NgYEGZT5r+NDg==}
+ /element-plus/2.9.7_vue@3.5.13:
+ resolution: {integrity: sha512-6vjZh5SXBncLhUwJGTVKS5oDljfgGMh6J4zVTeAZK3YdMUN76FgpvHkwwFXocpJpMbii6rDYU3sgie64FyPerQ==}
peerDependencies:
vue: ^3.2.0
dependencies:
diff --git a/public/config/config.json b/public/config/config.json
index d60ba89..b7ba181 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
{
"title":"感知数据汇聚平台",
- "baseUrl": "http://111.198.10.15:11643",
+ "baseUrl": "http://111.198.10.15:11646",
"securityJsCode": "56bf9671d4b3517d294caec4751889a1",
"JsKey": "40849e82b4e33f5255b17372520c954d",
"xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
@@ -27,5 +27,5 @@
},
"version": "1.0.1",
"node": "16.18.1",
- "mode": "windows"
+ "mode": "mobile"
}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3dfbab9..87c30b8 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -27,7 +27,7 @@
dayjs: ^1.11.6
echarts: ^5.4.1
echarts-gl: ^2.0.8
- element-plus: ^2.7.8
+ element-plus: ^2.9.7
eslint: ^8.27.0
esno: ^0.16.3
file-saver: ^2.0.5
@@ -95,7 +95,7 @@
dayjs: 1.11.13
echarts: 5.5.1
echarts-gl: 2.0.9_echarts@5.5.1
- element-plus: 2.9.1_vue@3.5.13
+ element-plus: 2.9.7_vue@3.5.13
file-saver: 2.0.5
hotkeys-js: 3.13.9
html2canvas: 1.4.1
@@ -3335,8 +3335,8 @@
resolution: {integrity: sha512-CjVQyG7n7Sr+eBXE86HIulnL5N8xZY1sgmOPGuq/F0Rr0FJq63lg0kEtOIDfZBk44FnDLf6FUJ+dsJcuiUDdDQ==}
dev: true
- /element-plus/2.9.1_vue@3.5.13:
- resolution: {integrity: sha512-9Agqf/jt4Ugk7EZ6C5LME71sgkvauPCsnvJN12Xid2XVobjufxMGpRE4L7pS4luJMOmFAH3J0NgYEGZT5r+NDg==}
+ /element-plus/2.9.7_vue@3.5.13:
+ resolution: {integrity: sha512-6vjZh5SXBncLhUwJGTVKS5oDljfgGMh6J4zVTeAZK3YdMUN76FgpvHkwwFXocpJpMbii6rDYU3sgie64FyPerQ==}
peerDependencies:
vue: ^3.2.0
dependencies:
diff --git a/public/config/config.json b/public/config/config.json
index d60ba89..b7ba181 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
{
"title":"感知数据汇聚平台",
- "baseUrl": "http://111.198.10.15:11643",
+ "baseUrl": "http://111.198.10.15:11646",
"securityJsCode": "56bf9671d4b3517d294caec4751889a1",
"JsKey": "40849e82b4e33f5255b17372520c954d",
"xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
@@ -27,5 +27,5 @@
},
"version": "1.0.1",
"node": "16.18.1",
- "mode": "windows"
+ "mode": "mobile"
}
diff --git a/src/api/home/force/index.ts b/src/api/home/force/index.ts
index 132d029..2023e60 100644
--- a/src/api/home/force/index.ts
+++ b/src/api/home/force/index.ts
@@ -1,5 +1,5 @@
/**
- * 放外力破坏监测
+ * 防外力破坏监测
*/
import request from '@/api/index'
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3dfbab9..87c30b8 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -27,7 +27,7 @@
dayjs: ^1.11.6
echarts: ^5.4.1
echarts-gl: ^2.0.8
- element-plus: ^2.7.8
+ element-plus: ^2.9.7
eslint: ^8.27.0
esno: ^0.16.3
file-saver: ^2.0.5
@@ -95,7 +95,7 @@
dayjs: 1.11.13
echarts: 5.5.1
echarts-gl: 2.0.9_echarts@5.5.1
- element-plus: 2.9.1_vue@3.5.13
+ element-plus: 2.9.7_vue@3.5.13
file-saver: 2.0.5
hotkeys-js: 3.13.9
html2canvas: 1.4.1
@@ -3335,8 +3335,8 @@
resolution: {integrity: sha512-CjVQyG7n7Sr+eBXE86HIulnL5N8xZY1sgmOPGuq/F0Rr0FJq63lg0kEtOIDfZBk44FnDLf6FUJ+dsJcuiUDdDQ==}
dev: true
- /element-plus/2.9.1_vue@3.5.13:
- resolution: {integrity: sha512-9Agqf/jt4Ugk7EZ6C5LME71sgkvauPCsnvJN12Xid2XVobjufxMGpRE4L7pS4luJMOmFAH3J0NgYEGZT5r+NDg==}
+ /element-plus/2.9.7_vue@3.5.13:
+ resolution: {integrity: sha512-6vjZh5SXBncLhUwJGTVKS5oDljfgGMh6J4zVTeAZK3YdMUN76FgpvHkwwFXocpJpMbii6rDYU3sgie64FyPerQ==}
peerDependencies:
vue: ^3.2.0
dependencies:
diff --git a/public/config/config.json b/public/config/config.json
index d60ba89..b7ba181 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
{
"title":"感知数据汇聚平台",
- "baseUrl": "http://111.198.10.15:11643",
+ "baseUrl": "http://111.198.10.15:11646",
"securityJsCode": "56bf9671d4b3517d294caec4751889a1",
"JsKey": "40849e82b4e33f5255b17372520c954d",
"xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
@@ -27,5 +27,5 @@
},
"version": "1.0.1",
"node": "16.18.1",
- "mode": "windows"
+ "mode": "mobile"
}
diff --git a/src/api/home/force/index.ts b/src/api/home/force/index.ts
index 132d029..2023e60 100644
--- a/src/api/home/force/index.ts
+++ b/src/api/home/force/index.ts
@@ -1,5 +1,5 @@
/**
- * 放外力破坏监测
+ * 防外力破坏监测
*/
import request from '@/api/index'
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index e41ba6a..9a3bc91 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -351,7 +351,7 @@
@filter-change="filterChange" @row-contextmenu="contextmenu" @sort-change="sortClick"
:row-class-name="props.tableRowClassName"
>
-
+
@@ -359,7 +359,8 @@
+ :selectable="selectable" header-cell-class-name="all-select" class="all-select" />
+
-
+
@@ -359,7 +359,8 @@
+ :selectable="selectable" header-cell-class-name="all-select" class="all-select" />
+
- {{ info.ts ? info.ts : info.alarmTime }}
+ {{ info.alarmTime }}
占位
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3dfbab9..87c30b8 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -27,7 +27,7 @@
dayjs: ^1.11.6
echarts: ^5.4.1
echarts-gl: ^2.0.8
- element-plus: ^2.7.8
+ element-plus: ^2.9.7
eslint: ^8.27.0
esno: ^0.16.3
file-saver: ^2.0.5
@@ -95,7 +95,7 @@
dayjs: 1.11.13
echarts: 5.5.1
echarts-gl: 2.0.9_echarts@5.5.1
- element-plus: 2.9.1_vue@3.5.13
+ element-plus: 2.9.7_vue@3.5.13
file-saver: 2.0.5
hotkeys-js: 3.13.9
html2canvas: 1.4.1
@@ -3335,8 +3335,8 @@
resolution: {integrity: sha512-CjVQyG7n7Sr+eBXE86HIulnL5N8xZY1sgmOPGuq/F0Rr0FJq63lg0kEtOIDfZBk44FnDLf6FUJ+dsJcuiUDdDQ==}
dev: true
- /element-plus/2.9.1_vue@3.5.13:
- resolution: {integrity: sha512-9Agqf/jt4Ugk7EZ6C5LME71sgkvauPCsnvJN12Xid2XVobjufxMGpRE4L7pS4luJMOmFAH3J0NgYEGZT5r+NDg==}
+ /element-plus/2.9.7_vue@3.5.13:
+ resolution: {integrity: sha512-6vjZh5SXBncLhUwJGTVKS5oDljfgGMh6J4zVTeAZK3YdMUN76FgpvHkwwFXocpJpMbii6rDYU3sgie64FyPerQ==}
peerDependencies:
vue: ^3.2.0
dependencies:
diff --git a/public/config/config.json b/public/config/config.json
index d60ba89..b7ba181 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
{
"title":"感知数据汇聚平台",
- "baseUrl": "http://111.198.10.15:11643",
+ "baseUrl": "http://111.198.10.15:11646",
"securityJsCode": "56bf9671d4b3517d294caec4751889a1",
"JsKey": "40849e82b4e33f5255b17372520c954d",
"xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
@@ -27,5 +27,5 @@
},
"version": "1.0.1",
"node": "16.18.1",
- "mode": "windows"
+ "mode": "mobile"
}
diff --git a/src/api/home/force/index.ts b/src/api/home/force/index.ts
index 132d029..2023e60 100644
--- a/src/api/home/force/index.ts
+++ b/src/api/home/force/index.ts
@@ -1,5 +1,5 @@
/**
- * 放外力破坏监测
+ * 防外力破坏监测
*/
import request from '@/api/index'
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index e41ba6a..9a3bc91 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -351,7 +351,7 @@
@filter-change="filterChange" @row-contextmenu="contextmenu" @sort-change="sortClick"
:row-class-name="props.tableRowClassName"
>
-
+
@@ -359,7 +359,8 @@
+ :selectable="selectable" header-cell-class-name="all-select" class="all-select" />
+
- {{ info.ts ? info.ts : info.alarmTime }}
+ {{ info.alarmTime }}
占位
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index f5b0ac9..130a012 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -8,6 +8,7 @@
import indexDB from '@/utils/indexDB'
import { decrypt, isEncrypt } from '@/utils/security1'
import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95, fetchCacheVideo, fetchCacheLeak } from '@/utils/sessionData'
+import { ElMessage } from 'element-plus'
const useUserStore = defineStore(
// 唯一ID
'user',
@@ -94,6 +95,7 @@
this.token = res.data.token
this.isLogout = 0
resolve()
+
}).catch((error) => {
reject(error)
})
@@ -148,6 +150,51 @@
getUserInfo() {
return new Promise((resolve) => {
getInfo().then((res) => {
+ const hanlder = () => {
+ this.isLogout += 1
+ const routeStore = useRouteStore()
+ const menuStore = useMenuStore()
+ localStorage.removeItem('username')
+ localStorage.removeItem('token')
+ localStorage.removeItem('nameId')
+ localStorage.removeItem('depId')
+ this.username = ''
+ this.token = ''
+ this.roleList = []
+ this.roleNames = []
+ this.dataScope = []
+ routeStore.removeRoutes()
+ menuStore.setActived(0)
+ menuStore.resetBreadcrumb()
+ }
+ if (window.localStorage.getItem('browser-type-bj-well') === 'pc') {
+ // pc端
+ if (res.data.avatar && !res.data.avatar.includes('.')) {
+ reject('厂商账号，不允许跨系统登录')
+ // 这是移动端账号，不让登录pc
+ hanlder()
+ ElMessage.error('厂商账号，不允许跨系统登录')
+ // 刷新页面
+ setTimeout(() => {
+ window.location.reload()
+ }, 1000);
+ return
+ }
+ }
+ else {
+ // 移动端
+ if (!res.data.avatar || res.data.avatar.includes('.')) {
+ reject('只允许厂商账号登录')
+ hanlder()
+ ElMessage.error('只允许厂商账号登录')
+ // 刷新页面
+ setTimeout(() => {
+ window.location.reload()
+ }, 1000);
+ }
+ }
+
+
if (res.data.roleIds && res.data.roleIds.length > 0) {
this.roleList = res.data.roleIds
this.roleNames = res.data.roleNames
@@ -167,6 +214,7 @@
reject('该用户无组织机构')
}
this.id = res.data.id
+ this.avatar = res.data.avatar
this.username = res.data.account
this.name = isEncrypt(res.data.name) ? decrypt(res.data.name) : res.data.name
resolve(res.data)
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3dfbab9..87c30b8 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -27,7 +27,7 @@
dayjs: ^1.11.6
echarts: ^5.4.1
echarts-gl: ^2.0.8
- element-plus: ^2.7.8
+ element-plus: ^2.9.7
eslint: ^8.27.0
esno: ^0.16.3
file-saver: ^2.0.5
@@ -95,7 +95,7 @@
dayjs: 1.11.13
echarts: 5.5.1
echarts-gl: 2.0.9_echarts@5.5.1
- element-plus: 2.9.1_vue@3.5.13
+ element-plus: 2.9.7_vue@3.5.13
file-saver: 2.0.5
hotkeys-js: 3.13.9
html2canvas: 1.4.1
@@ -3335,8 +3335,8 @@
resolution: {integrity: sha512-CjVQyG7n7Sr+eBXE86HIulnL5N8xZY1sgmOPGuq/F0Rr0FJq63lg0kEtOIDfZBk44FnDLf6FUJ+dsJcuiUDdDQ==}
dev: true
- /element-plus/2.9.1_vue@3.5.13:
- resolution: {integrity: sha512-9Agqf/jt4Ugk7EZ6C5LME71sgkvauPCsnvJN12Xid2XVobjufxMGpRE4L7pS4luJMOmFAH3J0NgYEGZT5r+NDg==}
+ /element-plus/2.9.7_vue@3.5.13:
+ resolution: {integrity: sha512-6vjZh5SXBncLhUwJGTVKS5oDljfgGMh6J4zVTeAZK3YdMUN76FgpvHkwwFXocpJpMbii6rDYU3sgie64FyPerQ==}
peerDependencies:
vue: ^3.2.0
dependencies:
diff --git a/public/config/config.json b/public/config/config.json
index d60ba89..b7ba181 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
{
"title":"感知数据汇聚平台",
- "baseUrl": "http://111.198.10.15:11643",
+ "baseUrl": "http://111.198.10.15:11646",
"securityJsCode": "56bf9671d4b3517d294caec4751889a1",
"JsKey": "40849e82b4e33f5255b17372520c954d",
"xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
@@ -27,5 +27,5 @@
},
"version": "1.0.1",
"node": "16.18.1",
- "mode": "windows"
+ "mode": "mobile"
}
diff --git a/src/api/home/force/index.ts b/src/api/home/force/index.ts
index 132d029..2023e60 100644
--- a/src/api/home/force/index.ts
+++ b/src/api/home/force/index.ts
@@ -1,5 +1,5 @@
/**
- * 放外力破坏监测
+ * 防外力破坏监测
*/
import request from '@/api/index'
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index e41ba6a..9a3bc91 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -351,7 +351,7 @@
@filter-change="filterChange" @row-contextmenu="contextmenu" @sort-change="sortClick"
:row-class-name="props.tableRowClassName"
>
-
+
@@ -359,7 +359,8 @@
+ :selectable="selectable" header-cell-class-name="all-select" class="all-select" />
+
- {{ info.ts ? info.ts : info.alarmTime }}
+ {{ info.alarmTime }}
占位
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index f5b0ac9..130a012 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -8,6 +8,7 @@
import indexDB from '@/utils/indexDB'
import { decrypt, isEncrypt } from '@/utils/security1'
import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95, fetchCacheVideo, fetchCacheLeak } from '@/utils/sessionData'
+import { ElMessage } from 'element-plus'
const useUserStore = defineStore(
// 唯一ID
'user',
@@ -94,6 +95,7 @@
this.token = res.data.token
this.isLogout = 0
resolve()
+
}).catch((error) => {
reject(error)
})
@@ -148,6 +150,51 @@
getUserInfo() {
return new Promise((resolve) => {
getInfo().then((res) => {
+ const hanlder = () => {
+ this.isLogout += 1
+ const routeStore = useRouteStore()
+ const menuStore = useMenuStore()
+ localStorage.removeItem('username')
+ localStorage.removeItem('token')
+ localStorage.removeItem('nameId')
+ localStorage.removeItem('depId')
+ this.username = ''
+ this.token = ''
+ this.roleList = []
+ this.roleNames = []
+ this.dataScope = []
+ routeStore.removeRoutes()
+ menuStore.setActived(0)
+ menuStore.resetBreadcrumb()
+ }
+ if (window.localStorage.getItem('browser-type-bj-well') === 'pc') {
+ // pc端
+ if (res.data.avatar && !res.data.avatar.includes('.')) {
+ reject('厂商账号，不允许跨系统登录')
+ // 这是移动端账号，不让登录pc
+ hanlder()
+ ElMessage.error('厂商账号，不允许跨系统登录')
+ // 刷新页面
+ setTimeout(() => {
+ window.location.reload()
+ }, 1000);
+ return
+ }
+ }
+ else {
+ // 移动端
+ if (!res.data.avatar || res.data.avatar.includes('.')) {
+ reject('只允许厂商账号登录')
+ hanlder()
+ ElMessage.error('只允许厂商账号登录')
+ // 刷新页面
+ setTimeout(() => {
+ window.location.reload()
+ }, 1000);
+ }
+ }
+
+
if (res.data.roleIds && res.data.roleIds.length > 0) {
this.roleList = res.data.roleIds
this.roleNames = res.data.roleNames
@@ -167,6 +214,7 @@
reject('该用户无组织机构')
}
this.id = res.data.id
+ this.avatar = res.data.avatar
this.username = res.data.account
this.name = isEncrypt(res.data.name) ? decrypt(res.data.name) : res.data.name
resolve(res.data)
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index e816270..d351b24 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -271,9 +271,9 @@
}
// 全局报警弹窗跳转过来
if ($route.query.type === 'alarm-dialog') {
- obj.begTime = row.ts ? row.ts : row.alarmTime
- obj.endTime = row.ts ? row.ts : row.alarmTime
- datetimerange.value = [row.ts ? row.ts : row.alarmTime, row.ts ? row.ts : row.alarmTime]
+ obj.begTime = row.alarmTime
+ obj.endTime = row.alarmTime
+ datetimerange.value = [row.alarmTime, row.alarmTime]
obj.position = row.tagNumber
listQuery.value.position = row.tagNumber
// alarmTypeList.value
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3dfbab9..87c30b8 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -27,7 +27,7 @@
dayjs: ^1.11.6
echarts: ^5.4.1
echarts-gl: ^2.0.8
- element-plus: ^2.7.8
+ element-plus: ^2.9.7
eslint: ^8.27.0
esno: ^0.16.3
file-saver: ^2.0.5
@@ -95,7 +95,7 @@
dayjs: 1.11.13
echarts: 5.5.1
echarts-gl: 2.0.9_echarts@5.5.1
- element-plus: 2.9.1_vue@3.5.13
+ element-plus: 2.9.7_vue@3.5.13
file-saver: 2.0.5
hotkeys-js: 3.13.9
html2canvas: 1.4.1
@@ -3335,8 +3335,8 @@
resolution: {integrity: sha512-CjVQyG7n7Sr+eBXE86HIulnL5N8xZY1sgmOPGuq/F0Rr0FJq63lg0kEtOIDfZBk44FnDLf6FUJ+dsJcuiUDdDQ==}
dev: true
- /element-plus/2.9.1_vue@3.5.13:
- resolution: {integrity: sha512-9Agqf/jt4Ugk7EZ6C5LME71sgkvauPCsnvJN12Xid2XVobjufxMGpRE4L7pS4luJMOmFAH3J0NgYEGZT5r+NDg==}
+ /element-plus/2.9.7_vue@3.5.13:
+ resolution: {integrity: sha512-6vjZh5SXBncLhUwJGTVKS5oDljfgGMh6J4zVTeAZK3YdMUN76FgpvHkwwFXocpJpMbii6rDYU3sgie64FyPerQ==}
peerDependencies:
vue: ^3.2.0
dependencies:
diff --git a/public/config/config.json b/public/config/config.json
index d60ba89..b7ba181 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
{
"title":"感知数据汇聚平台",
- "baseUrl": "http://111.198.10.15:11643",
+ "baseUrl": "http://111.198.10.15:11646",
"securityJsCode": "56bf9671d4b3517d294caec4751889a1",
"JsKey": "40849e82b4e33f5255b17372520c954d",
"xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
@@ -27,5 +27,5 @@
},
"version": "1.0.1",
"node": "16.18.1",
- "mode": "windows"
+ "mode": "mobile"
}
diff --git a/src/api/home/force/index.ts b/src/api/home/force/index.ts
index 132d029..2023e60 100644
--- a/src/api/home/force/index.ts
+++ b/src/api/home/force/index.ts
@@ -1,5 +1,5 @@
/**
- * 放外力破坏监测
+ * 防外力破坏监测
*/
import request from '@/api/index'
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index e41ba6a..9a3bc91 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -351,7 +351,7 @@
@filter-change="filterChange" @row-contextmenu="contextmenu" @sort-change="sortClick"
:row-class-name="props.tableRowClassName"
>
-
+
@@ -359,7 +359,8 @@
+ :selectable="selectable" header-cell-class-name="all-select" class="all-select" />
+
- {{ info.ts ? info.ts : info.alarmTime }}
+ {{ info.alarmTime }}
占位
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index f5b0ac9..130a012 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -8,6 +8,7 @@
import indexDB from '@/utils/indexDB'
import { decrypt, isEncrypt } from '@/utils/security1'
import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95, fetchCacheVideo, fetchCacheLeak } from '@/utils/sessionData'
+import { ElMessage } from 'element-plus'
const useUserStore = defineStore(
// 唯一ID
'user',
@@ -94,6 +95,7 @@
this.token = res.data.token
this.isLogout = 0
resolve()
+
}).catch((error) => {
reject(error)
})
@@ -148,6 +150,51 @@
getUserInfo() {
return new Promise((resolve) => {
getInfo().then((res) => {
+ const hanlder = () => {
+ this.isLogout += 1
+ const routeStore = useRouteStore()
+ const menuStore = useMenuStore()
+ localStorage.removeItem('username')
+ localStorage.removeItem('token')
+ localStorage.removeItem('nameId')
+ localStorage.removeItem('depId')
+ this.username = ''
+ this.token = ''
+ this.roleList = []
+ this.roleNames = []
+ this.dataScope = []
+ routeStore.removeRoutes()
+ menuStore.setActived(0)
+ menuStore.resetBreadcrumb()
+ }
+ if (window.localStorage.getItem('browser-type-bj-well') === 'pc') {
+ // pc端
+ if (res.data.avatar && !res.data.avatar.includes('.')) {
+ reject('厂商账号，不允许跨系统登录')
+ // 这是移动端账号，不让登录pc
+ hanlder()
+ ElMessage.error('厂商账号，不允许跨系统登录')
+ // 刷新页面
+ setTimeout(() => {
+ window.location.reload()
+ }, 1000);
+ return
+ }
+ }
+ else {
+ // 移动端
+ if (!res.data.avatar || res.data.avatar.includes('.')) {
+ reject('只允许厂商账号登录')
+ hanlder()
+ ElMessage.error('只允许厂商账号登录')
+ // 刷新页面
+ setTimeout(() => {
+ window.location.reload()
+ }, 1000);
+ }
+ }
+
+
if (res.data.roleIds && res.data.roleIds.length > 0) {
this.roleList = res.data.roleIds
this.roleNames = res.data.roleNames
@@ -167,6 +214,7 @@
reject('该用户无组织机构')
}
this.id = res.data.id
+ this.avatar = res.data.avatar
this.username = res.data.account
this.name = isEncrypt(res.data.name) ? decrypt(res.data.name) : res.data.name
resolve(res.data)
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index e816270..d351b24 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -271,9 +271,9 @@
}
// 全局报警弹窗跳转过来
if ($route.query.type === 'alarm-dialog') {
- obj.begTime = row.ts ? row.ts : row.alarmTime
- obj.endTime = row.ts ? row.ts : row.alarmTime
- datetimerange.value = [row.ts ? row.ts : row.alarmTime, row.ts ? row.ts : row.alarmTime]
+ obj.begTime = row.alarmTime
+ obj.endTime = row.alarmTime
+ datetimerange.value = [row.alarmTime, row.alarmTime]
obj.position = row.tagNumber
listQuery.value.position = row.tagNumber
// alarmTypeList.value
diff --git a/src/views/home/dashboard/deviceMonitor.vue b/src/views/home/dashboard/deviceMonitor.vue
index 046b750..863d853 100644
--- a/src/views/home/dashboard/deviceMonitor.vue
+++ b/src/views/home/dashboard/deviceMonitor.vue
@@ -782,7 +782,7 @@
value: '2',
},
{
- name: '放外力破坏',
+ name: '防外力破坏',
url: `${publicPath}/image/force/force-normal.png`,
value: '2',
},
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3dfbab9..87c30b8 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -27,7 +27,7 @@
dayjs: ^1.11.6
echarts: ^5.4.1
echarts-gl: ^2.0.8
- element-plus: ^2.7.8
+ element-plus: ^2.9.7
eslint: ^8.27.0
esno: ^0.16.3
file-saver: ^2.0.5
@@ -95,7 +95,7 @@
dayjs: 1.11.13
echarts: 5.5.1
echarts-gl: 2.0.9_echarts@5.5.1
- element-plus: 2.9.1_vue@3.5.13
+ element-plus: 2.9.7_vue@3.5.13
file-saver: 2.0.5
hotkeys-js: 3.13.9
html2canvas: 1.4.1
@@ -3335,8 +3335,8 @@
resolution: {integrity: sha512-CjVQyG7n7Sr+eBXE86HIulnL5N8xZY1sgmOPGuq/F0Rr0FJq63lg0kEtOIDfZBk44FnDLf6FUJ+dsJcuiUDdDQ==}
dev: true
- /element-plus/2.9.1_vue@3.5.13:
- resolution: {integrity: sha512-9Agqf/jt4Ugk7EZ6C5LME71sgkvauPCsnvJN12Xid2XVobjufxMGpRE4L7pS4luJMOmFAH3J0NgYEGZT5r+NDg==}
+ /element-plus/2.9.7_vue@3.5.13:
+ resolution: {integrity: sha512-6vjZh5SXBncLhUwJGTVKS5oDljfgGMh6J4zVTeAZK3YdMUN76FgpvHkwwFXocpJpMbii6rDYU3sgie64FyPerQ==}
peerDependencies:
vue: ^3.2.0
dependencies:
diff --git a/public/config/config.json b/public/config/config.json
index d60ba89..b7ba181 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
{
"title":"感知数据汇聚平台",
- "baseUrl": "http://111.198.10.15:11643",
+ "baseUrl": "http://111.198.10.15:11646",
"securityJsCode": "56bf9671d4b3517d294caec4751889a1",
"JsKey": "40849e82b4e33f5255b17372520c954d",
"xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
@@ -27,5 +27,5 @@
},
"version": "1.0.1",
"node": "16.18.1",
- "mode": "windows"
+ "mode": "mobile"
}
diff --git a/src/api/home/force/index.ts b/src/api/home/force/index.ts
index 132d029..2023e60 100644
--- a/src/api/home/force/index.ts
+++ b/src/api/home/force/index.ts
@@ -1,5 +1,5 @@
/**
- * 放外力破坏监测
+ * 防外力破坏监测
*/
import request from '@/api/index'
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index e41ba6a..9a3bc91 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -351,7 +351,7 @@
@filter-change="filterChange" @row-contextmenu="contextmenu" @sort-change="sortClick"
:row-class-name="props.tableRowClassName"
>
-
+
@@ -359,7 +359,8 @@
+ :selectable="selectable" header-cell-class-name="all-select" class="all-select" />
+
- {{ info.ts ? info.ts : info.alarmTime }}
+ {{ info.alarmTime }}
占位
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index f5b0ac9..130a012 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -8,6 +8,7 @@
import indexDB from '@/utils/indexDB'
import { decrypt, isEncrypt } from '@/utils/security1'
import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95, fetchCacheVideo, fetchCacheLeak } from '@/utils/sessionData'
+import { ElMessage } from 'element-plus'
const useUserStore = defineStore(
// 唯一ID
'user',
@@ -94,6 +95,7 @@
this.token = res.data.token
this.isLogout = 0
resolve()
+
}).catch((error) => {
reject(error)
})
@@ -148,6 +150,51 @@
getUserInfo() {
return new Promise((resolve) => {
getInfo().then((res) => {
+ const hanlder = () => {
+ this.isLogout += 1
+ const routeStore = useRouteStore()
+ const menuStore = useMenuStore()
+ localStorage.removeItem('username')
+ localStorage.removeItem('token')
+ localStorage.removeItem('nameId')
+ localStorage.removeItem('depId')
+ this.username = ''
+ this.token = ''
+ this.roleList = []
+ this.roleNames = []
+ this.dataScope = []
+ routeStore.removeRoutes()
+ menuStore.setActived(0)
+ menuStore.resetBreadcrumb()
+ }
+ if (window.localStorage.getItem('browser-type-bj-well') === 'pc') {
+ // pc端
+ if (res.data.avatar && !res.data.avatar.includes('.')) {
+ reject('厂商账号，不允许跨系统登录')
+ // 这是移动端账号，不让登录pc
+ hanlder()
+ ElMessage.error('厂商账号，不允许跨系统登录')
+ // 刷新页面
+ setTimeout(() => {
+ window.location.reload()
+ }, 1000);
+ return
+ }
+ }
+ else {
+ // 移动端
+ if (!res.data.avatar || res.data.avatar.includes('.')) {
+ reject('只允许厂商账号登录')
+ hanlder()
+ ElMessage.error('只允许厂商账号登录')
+ // 刷新页面
+ setTimeout(() => {
+ window.location.reload()
+ }, 1000);
+ }
+ }
+
+
if (res.data.roleIds && res.data.roleIds.length > 0) {
this.roleList = res.data.roleIds
this.roleNames = res.data.roleNames
@@ -167,6 +214,7 @@
reject('该用户无组织机构')
}
this.id = res.data.id
+ this.avatar = res.data.avatar
this.username = res.data.account
this.name = isEncrypt(res.data.name) ? decrypt(res.data.name) : res.data.name
resolve(res.data)
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index e816270..d351b24 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -271,9 +271,9 @@
}
// 全局报警弹窗跳转过来
if ($route.query.type === 'alarm-dialog') {
- obj.begTime = row.ts ? row.ts : row.alarmTime
- obj.endTime = row.ts ? row.ts : row.alarmTime
- datetimerange.value = [row.ts ? row.ts : row.alarmTime, row.ts ? row.ts : row.alarmTime]
+ obj.begTime = row.alarmTime
+ obj.endTime = row.alarmTime
+ datetimerange.value = [row.alarmTime, row.alarmTime]
obj.position = row.tagNumber
listQuery.value.position = row.tagNumber
// alarmTypeList.value
diff --git a/src/views/home/dashboard/deviceMonitor.vue b/src/views/home/dashboard/deviceMonitor.vue
index 046b750..863d853 100644
--- a/src/views/home/dashboard/deviceMonitor.vue
+++ b/src/views/home/dashboard/deviceMonitor.vue
@@ -782,7 +782,7 @@
value: '2',
},
{
- name: '放外力破坏',
+ name: '防外力破坏',
url: `${publicPath}/image/force/force-normal.png`,
value: '2',
},
diff --git a/src/views/home/force/components/map.vue b/src/views/home/force/components/map.vue
index e4883cf..d91dec6 100644
--- a/src/views/home/force/components/map.vue
+++ b/src/views/home/force/components/map.vue
@@ -1,5 +1,5 @@
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3dfbab9..87c30b8 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -27,7 +27,7 @@
dayjs: ^1.11.6
echarts: ^5.4.1
echarts-gl: ^2.0.8
- element-plus: ^2.7.8
+ element-plus: ^2.9.7
eslint: ^8.27.0
esno: ^0.16.3
file-saver: ^2.0.5
@@ -95,7 +95,7 @@
dayjs: 1.11.13
echarts: 5.5.1
echarts-gl: 2.0.9_echarts@5.5.1
- element-plus: 2.9.1_vue@3.5.13
+ element-plus: 2.9.7_vue@3.5.13
file-saver: 2.0.5
hotkeys-js: 3.13.9
html2canvas: 1.4.1
@@ -3335,8 +3335,8 @@
resolution: {integrity: sha512-CjVQyG7n7Sr+eBXE86HIulnL5N8xZY1sgmOPGuq/F0Rr0FJq63lg0kEtOIDfZBk44FnDLf6FUJ+dsJcuiUDdDQ==}
dev: true
- /element-plus/2.9.1_vue@3.5.13:
- resolution: {integrity: sha512-9Agqf/jt4Ugk7EZ6C5LME71sgkvauPCsnvJN12Xid2XVobjufxMGpRE4L7pS4luJMOmFAH3J0NgYEGZT5r+NDg==}
+ /element-plus/2.9.7_vue@3.5.13:
+ resolution: {integrity: sha512-6vjZh5SXBncLhUwJGTVKS5oDljfgGMh6J4zVTeAZK3YdMUN76FgpvHkwwFXocpJpMbii6rDYU3sgie64FyPerQ==}
peerDependencies:
vue: ^3.2.0
dependencies:
diff --git a/public/config/config.json b/public/config/config.json
index d60ba89..b7ba181 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
{
"title":"感知数据汇聚平台",
- "baseUrl": "http://111.198.10.15:11643",
+ "baseUrl": "http://111.198.10.15:11646",
"securityJsCode": "56bf9671d4b3517d294caec4751889a1",
"JsKey": "40849e82b4e33f5255b17372520c954d",
"xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
@@ -27,5 +27,5 @@
},
"version": "1.0.1",
"node": "16.18.1",
- "mode": "windows"
+ "mode": "mobile"
}
diff --git a/src/api/home/force/index.ts b/src/api/home/force/index.ts
index 132d029..2023e60 100644
--- a/src/api/home/force/index.ts
+++ b/src/api/home/force/index.ts
@@ -1,5 +1,5 @@
/**
- * 放外力破坏监测
+ * 防外力破坏监测
*/
import request from '@/api/index'
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index e41ba6a..9a3bc91 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -351,7 +351,7 @@
@filter-change="filterChange" @row-contextmenu="contextmenu" @sort-change="sortClick"
:row-class-name="props.tableRowClassName"
>
-
+
@@ -359,7 +359,8 @@
+ :selectable="selectable" header-cell-class-name="all-select" class="all-select" />
+
- {{ info.ts ? info.ts : info.alarmTime }}
+ {{ info.alarmTime }}
占位
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index f5b0ac9..130a012 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -8,6 +8,7 @@
import indexDB from '@/utils/indexDB'
import { decrypt, isEncrypt } from '@/utils/security1'
import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95, fetchCacheVideo, fetchCacheLeak } from '@/utils/sessionData'
+import { ElMessage } from 'element-plus'
const useUserStore = defineStore(
// 唯一ID
'user',
@@ -94,6 +95,7 @@
this.token = res.data.token
this.isLogout = 0
resolve()
+
}).catch((error) => {
reject(error)
})
@@ -148,6 +150,51 @@
getUserInfo() {
return new Promise((resolve) => {
getInfo().then((res) => {
+ const hanlder = () => {
+ this.isLogout += 1
+ const routeStore = useRouteStore()
+ const menuStore = useMenuStore()
+ localStorage.removeItem('username')
+ localStorage.removeItem('token')
+ localStorage.removeItem('nameId')
+ localStorage.removeItem('depId')
+ this.username = ''
+ this.token = ''
+ this.roleList = []
+ this.roleNames = []
+ this.dataScope = []
+ routeStore.removeRoutes()
+ menuStore.setActived(0)
+ menuStore.resetBreadcrumb()
+ }
+ if (window.localStorage.getItem('browser-type-bj-well') === 'pc') {
+ // pc端
+ if (res.data.avatar && !res.data.avatar.includes('.')) {
+ reject('厂商账号，不允许跨系统登录')
+ // 这是移动端账号，不让登录pc
+ hanlder()
+ ElMessage.error('厂商账号，不允许跨系统登录')
+ // 刷新页面
+ setTimeout(() => {
+ window.location.reload()
+ }, 1000);
+ return
+ }
+ }
+ else {
+ // 移动端
+ if (!res.data.avatar || res.data.avatar.includes('.')) {
+ reject('只允许厂商账号登录')
+ hanlder()
+ ElMessage.error('只允许厂商账号登录')
+ // 刷新页面
+ setTimeout(() => {
+ window.location.reload()
+ }, 1000);
+ }
+ }
+
+
if (res.data.roleIds && res.data.roleIds.length > 0) {
this.roleList = res.data.roleIds
this.roleNames = res.data.roleNames
@@ -167,6 +214,7 @@
reject('该用户无组织机构')
}
this.id = res.data.id
+ this.avatar = res.data.avatar
this.username = res.data.account
this.name = isEncrypt(res.data.name) ? decrypt(res.data.name) : res.data.name
resolve(res.data)
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index e816270..d351b24 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -271,9 +271,9 @@
}
// 全局报警弹窗跳转过来
if ($route.query.type === 'alarm-dialog') {
- obj.begTime = row.ts ? row.ts : row.alarmTime
- obj.endTime = row.ts ? row.ts : row.alarmTime
- datetimerange.value = [row.ts ? row.ts : row.alarmTime, row.ts ? row.ts : row.alarmTime]
+ obj.begTime = row.alarmTime
+ obj.endTime = row.alarmTime
+ datetimerange.value = [row.alarmTime, row.alarmTime]
obj.position = row.tagNumber
listQuery.value.position = row.tagNumber
// alarmTypeList.value
diff --git a/src/views/home/dashboard/deviceMonitor.vue b/src/views/home/dashboard/deviceMonitor.vue
index 046b750..863d853 100644
--- a/src/views/home/dashboard/deviceMonitor.vue
+++ b/src/views/home/dashboard/deviceMonitor.vue
@@ -782,7 +782,7 @@
value: '2',
},
{
- name: '放外力破坏',
+ name: '防外力破坏',
url: `${publicPath}/image/force/force-normal.png`,
value: '2',
},
diff --git a/src/views/home/force/components/map.vue b/src/views/home/force/components/map.vue
index e4883cf..d91dec6 100644
--- a/src/views/home/force/components/map.vue
+++ b/src/views/home/force/components/map.vue
@@ -1,5 +1,5 @@
diff --git a/src/views/home/force/index.vue b/src/views/home/force/index.vue
index 1f78b44..197fddd 100644
--- a/src/views/home/force/index.vue
+++ b/src/views/home/force/index.vue
@@ -1,5 +1,5 @@
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3dfbab9..87c30b8 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -27,7 +27,7 @@
dayjs: ^1.11.6
echarts: ^5.4.1
echarts-gl: ^2.0.8
- element-plus: ^2.7.8
+ element-plus: ^2.9.7
eslint: ^8.27.0
esno: ^0.16.3
file-saver: ^2.0.5
@@ -95,7 +95,7 @@
dayjs: 1.11.13
echarts: 5.5.1
echarts-gl: 2.0.9_echarts@5.5.1
- element-plus: 2.9.1_vue@3.5.13
+ element-plus: 2.9.7_vue@3.5.13
file-saver: 2.0.5
hotkeys-js: 3.13.9
html2canvas: 1.4.1
@@ -3335,8 +3335,8 @@
resolution: {integrity: sha512-CjVQyG7n7Sr+eBXE86HIulnL5N8xZY1sgmOPGuq/F0Rr0FJq63lg0kEtOIDfZBk44FnDLf6FUJ+dsJcuiUDdDQ==}
dev: true
- /element-plus/2.9.1_vue@3.5.13:
- resolution: {integrity: sha512-9Agqf/jt4Ugk7EZ6C5LME71sgkvauPCsnvJN12Xid2XVobjufxMGpRE4L7pS4luJMOmFAH3J0NgYEGZT5r+NDg==}
+ /element-plus/2.9.7_vue@3.5.13:
+ resolution: {integrity: sha512-6vjZh5SXBncLhUwJGTVKS5oDljfgGMh6J4zVTeAZK3YdMUN76FgpvHkwwFXocpJpMbii6rDYU3sgie64FyPerQ==}
peerDependencies:
vue: ^3.2.0
dependencies:
diff --git a/public/config/config.json b/public/config/config.json
index d60ba89..b7ba181 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
{
"title":"感知数据汇聚平台",
- "baseUrl": "http://111.198.10.15:11643",
+ "baseUrl": "http://111.198.10.15:11646",
"securityJsCode": "56bf9671d4b3517d294caec4751889a1",
"JsKey": "40849e82b4e33f5255b17372520c954d",
"xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
@@ -27,5 +27,5 @@
},
"version": "1.0.1",
"node": "16.18.1",
- "mode": "windows"
+ "mode": "mobile"
}
diff --git a/src/api/home/force/index.ts b/src/api/home/force/index.ts
index 132d029..2023e60 100644
--- a/src/api/home/force/index.ts
+++ b/src/api/home/force/index.ts
@@ -1,5 +1,5 @@
/**
- * 放外力破坏监测
+ * 防外力破坏监测
*/
import request from '@/api/index'
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index e41ba6a..9a3bc91 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -351,7 +351,7 @@
@filter-change="filterChange" @row-contextmenu="contextmenu" @sort-change="sortClick"
:row-class-name="props.tableRowClassName"
>
-
+
@@ -359,7 +359,8 @@
+ :selectable="selectable" header-cell-class-name="all-select" class="all-select" />
+
- {{ info.ts ? info.ts : info.alarmTime }}
+ {{ info.alarmTime }}
占位
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index f5b0ac9..130a012 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -8,6 +8,7 @@
import indexDB from '@/utils/indexDB'
import { decrypt, isEncrypt } from '@/utils/security1'
import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95, fetchCacheVideo, fetchCacheLeak } from '@/utils/sessionData'
+import { ElMessage } from 'element-plus'
const useUserStore = defineStore(
// 唯一ID
'user',
@@ -94,6 +95,7 @@
this.token = res.data.token
this.isLogout = 0
resolve()
+
}).catch((error) => {
reject(error)
})
@@ -148,6 +150,51 @@
getUserInfo() {
return new Promise((resolve) => {
getInfo().then((res) => {
+ const hanlder = () => {
+ this.isLogout += 1
+ const routeStore = useRouteStore()
+ const menuStore = useMenuStore()
+ localStorage.removeItem('username')
+ localStorage.removeItem('token')
+ localStorage.removeItem('nameId')
+ localStorage.removeItem('depId')
+ this.username = ''
+ this.token = ''
+ this.roleList = []
+ this.roleNames = []
+ this.dataScope = []
+ routeStore.removeRoutes()
+ menuStore.setActived(0)
+ menuStore.resetBreadcrumb()
+ }
+ if (window.localStorage.getItem('browser-type-bj-well') === 'pc') {
+ // pc端
+ if (res.data.avatar && !res.data.avatar.includes('.')) {
+ reject('厂商账号，不允许跨系统登录')
+ // 这是移动端账号，不让登录pc
+ hanlder()
+ ElMessage.error('厂商账号，不允许跨系统登录')
+ // 刷新页面
+ setTimeout(() => {
+ window.location.reload()
+ }, 1000);
+ return
+ }
+ }
+ else {
+ // 移动端
+ if (!res.data.avatar || res.data.avatar.includes('.')) {
+ reject('只允许厂商账号登录')
+ hanlder()
+ ElMessage.error('只允许厂商账号登录')
+ // 刷新页面
+ setTimeout(() => {
+ window.location.reload()
+ }, 1000);
+ }
+ }
+
+
if (res.data.roleIds && res.data.roleIds.length > 0) {
this.roleList = res.data.roleIds
this.roleNames = res.data.roleNames
@@ -167,6 +214,7 @@
reject('该用户无组织机构')
}
this.id = res.data.id
+ this.avatar = res.data.avatar
this.username = res.data.account
this.name = isEncrypt(res.data.name) ? decrypt(res.data.name) : res.data.name
resolve(res.data)
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index e816270..d351b24 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -271,9 +271,9 @@
}
// 全局报警弹窗跳转过来
if ($route.query.type === 'alarm-dialog') {
- obj.begTime = row.ts ? row.ts : row.alarmTime
- obj.endTime = row.ts ? row.ts : row.alarmTime
- datetimerange.value = [row.ts ? row.ts : row.alarmTime, row.ts ? row.ts : row.alarmTime]
+ obj.begTime = row.alarmTime
+ obj.endTime = row.alarmTime
+ datetimerange.value = [row.alarmTime, row.alarmTime]
obj.position = row.tagNumber
listQuery.value.position = row.tagNumber
// alarmTypeList.value
diff --git a/src/views/home/dashboard/deviceMonitor.vue b/src/views/home/dashboard/deviceMonitor.vue
index 046b750..863d853 100644
--- a/src/views/home/dashboard/deviceMonitor.vue
+++ b/src/views/home/dashboard/deviceMonitor.vue
@@ -782,7 +782,7 @@
value: '2',
},
{
- name: '放外力破坏',
+ name: '防外力破坏',
url: `${publicPath}/image/force/force-normal.png`,
value: '2',
},
diff --git a/src/views/home/force/components/map.vue b/src/views/home/force/components/map.vue
index e4883cf..d91dec6 100644
--- a/src/views/home/force/components/map.vue
+++ b/src/views/home/force/components/map.vue
@@ -1,5 +1,5 @@
diff --git a/src/views/home/force/index.vue b/src/views/home/force/index.vue
index 1f78b44..197fddd 100644
--- a/src/views/home/force/index.vue
+++ b/src/views/home/force/index.vue
@@ -1,5 +1,5 @@
diff --git a/src/views/home/well/components/map.vue b/src/views/home/well/components/map.vue
index 7a3c137..ef41d60 100644
--- a/src/views/home/well/components/map.vue
+++ b/src/views/home/well/components/map.vue
@@ -4,7 +4,6 @@
Date: 2023-07-08
-->
@@ -57,8 +73,9 @@
-
-
+
+
退出登录
@@ -133,6 +150,7 @@
overflow: auto;
}
}
+
::v-deep(.van-popup__close-icon) {
color: #000 !important;
}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3dfbab9..87c30b8 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -27,7 +27,7 @@
dayjs: ^1.11.6
echarts: ^5.4.1
echarts-gl: ^2.0.8
- element-plus: ^2.7.8
+ element-plus: ^2.9.7
eslint: ^8.27.0
esno: ^0.16.3
file-saver: ^2.0.5
@@ -95,7 +95,7 @@
dayjs: 1.11.13
echarts: 5.5.1
echarts-gl: 2.0.9_echarts@5.5.1
- element-plus: 2.9.1_vue@3.5.13
+ element-plus: 2.9.7_vue@3.5.13
file-saver: 2.0.5
hotkeys-js: 3.13.9
html2canvas: 1.4.1
@@ -3335,8 +3335,8 @@
resolution: {integrity: sha512-CjVQyG7n7Sr+eBXE86HIulnL5N8xZY1sgmOPGuq/F0Rr0FJq63lg0kEtOIDfZBk44FnDLf6FUJ+dsJcuiUDdDQ==}
dev: true
- /element-plus/2.9.1_vue@3.5.13:
- resolution: {integrity: sha512-9Agqf/jt4Ugk7EZ6C5LME71sgkvauPCsnvJN12Xid2XVobjufxMGpRE4L7pS4luJMOmFAH3J0NgYEGZT5r+NDg==}
+ /element-plus/2.9.7_vue@3.5.13:
+ resolution: {integrity: sha512-6vjZh5SXBncLhUwJGTVKS5oDljfgGMh6J4zVTeAZK3YdMUN76FgpvHkwwFXocpJpMbii6rDYU3sgie64FyPerQ==}
peerDependencies:
vue: ^3.2.0
dependencies:
diff --git a/public/config/config.json b/public/config/config.json
index d60ba89..b7ba181 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
{
"title":"感知数据汇聚平台",
- "baseUrl": "http://111.198.10.15:11643",
+ "baseUrl": "http://111.198.10.15:11646",
"securityJsCode": "56bf9671d4b3517d294caec4751889a1",
"JsKey": "40849e82b4e33f5255b17372520c954d",
"xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
@@ -27,5 +27,5 @@
},
"version": "1.0.1",
"node": "16.18.1",
- "mode": "windows"
+ "mode": "mobile"
}
diff --git a/src/api/home/force/index.ts b/src/api/home/force/index.ts
index 132d029..2023e60 100644
--- a/src/api/home/force/index.ts
+++ b/src/api/home/force/index.ts
@@ -1,5 +1,5 @@
/**
- * 放外力破坏监测
+ * 防外力破坏监测
*/
import request from '@/api/index'
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index e41ba6a..9a3bc91 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -351,7 +351,7 @@
@filter-change="filterChange" @row-contextmenu="contextmenu" @sort-change="sortClick"
:row-class-name="props.tableRowClassName"
>
-
+
@@ -359,7 +359,8 @@
+ :selectable="selectable" header-cell-class-name="all-select" class="all-select" />
+
- {{ info.ts ? info.ts : info.alarmTime }}
+ {{ info.alarmTime }}
占位
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index f5b0ac9..130a012 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -8,6 +8,7 @@
import indexDB from '@/utils/indexDB'
import { decrypt, isEncrypt } from '@/utils/security1'
import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95, fetchCacheVideo, fetchCacheLeak } from '@/utils/sessionData'
+import { ElMessage } from 'element-plus'
const useUserStore = defineStore(
// 唯一ID
'user',
@@ -94,6 +95,7 @@
this.token = res.data.token
this.isLogout = 0
resolve()
+
}).catch((error) => {
reject(error)
})
@@ -148,6 +150,51 @@
getUserInfo() {
return new Promise((resolve) => {
getInfo().then((res) => {
+ const hanlder = () => {
+ this.isLogout += 1
+ const routeStore = useRouteStore()
+ const menuStore = useMenuStore()
+ localStorage.removeItem('username')
+ localStorage.removeItem('token')
+ localStorage.removeItem('nameId')
+ localStorage.removeItem('depId')
+ this.username = ''
+ this.token = ''
+ this.roleList = []
+ this.roleNames = []
+ this.dataScope = []
+ routeStore.removeRoutes()
+ menuStore.setActived(0)
+ menuStore.resetBreadcrumb()
+ }
+ if (window.localStorage.getItem('browser-type-bj-well') === 'pc') {
+ // pc端
+ if (res.data.avatar && !res.data.avatar.includes('.')) {
+ reject('厂商账号，不允许跨系统登录')
+ // 这是移动端账号，不让登录pc
+ hanlder()
+ ElMessage.error('厂商账号，不允许跨系统登录')
+ // 刷新页面
+ setTimeout(() => {
+ window.location.reload()
+ }, 1000);
+ return
+ }
+ }
+ else {
+ // 移动端
+ if (!res.data.avatar || res.data.avatar.includes('.')) {
+ reject('只允许厂商账号登录')
+ hanlder()
+ ElMessage.error('只允许厂商账号登录')
+ // 刷新页面
+ setTimeout(() => {
+ window.location.reload()
+ }, 1000);
+ }
+ }
+
+
if (res.data.roleIds && res.data.roleIds.length > 0) {
this.roleList = res.data.roleIds
this.roleNames = res.data.roleNames
@@ -167,6 +214,7 @@
reject('该用户无组织机构')
}
this.id = res.data.id
+ this.avatar = res.data.avatar
this.username = res.data.account
this.name = isEncrypt(res.data.name) ? decrypt(res.data.name) : res.data.name
resolve(res.data)
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index e816270..d351b24 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -271,9 +271,9 @@
}
// 全局报警弹窗跳转过来
if ($route.query.type === 'alarm-dialog') {
- obj.begTime = row.ts ? row.ts : row.alarmTime
- obj.endTime = row.ts ? row.ts : row.alarmTime
- datetimerange.value = [row.ts ? row.ts : row.alarmTime, row.ts ? row.ts : row.alarmTime]
+ obj.begTime = row.alarmTime
+ obj.endTime = row.alarmTime
+ datetimerange.value = [row.alarmTime, row.alarmTime]
obj.position = row.tagNumber
listQuery.value.position = row.tagNumber
// alarmTypeList.value
diff --git a/src/views/home/dashboard/deviceMonitor.vue b/src/views/home/dashboard/deviceMonitor.vue
index 046b750..863d853 100644
--- a/src/views/home/dashboard/deviceMonitor.vue
+++ b/src/views/home/dashboard/deviceMonitor.vue
@@ -782,7 +782,7 @@
value: '2',
},
{
- name: '放外力破坏',
+ name: '防外力破坏',
url: `${publicPath}/image/force/force-normal.png`,
value: '2',
},
diff --git a/src/views/home/force/components/map.vue b/src/views/home/force/components/map.vue
index e4883cf..d91dec6 100644
--- a/src/views/home/force/components/map.vue
+++ b/src/views/home/force/components/map.vue
@@ -1,5 +1,5 @@
diff --git a/src/views/home/force/index.vue b/src/views/home/force/index.vue
index 1f78b44..197fddd 100644
--- a/src/views/home/force/index.vue
+++ b/src/views/home/force/index.vue
@@ -1,5 +1,5 @@
diff --git a/src/views/home/well/components/map.vue b/src/views/home/well/components/map.vue
index 7a3c137..ef41d60 100644
--- a/src/views/home/well/components/map.vue
+++ b/src/views/home/well/components/map.vue
@@ -4,7 +4,6 @@
Date: 2023-07-08
-->
@@ -57,8 +73,9 @@
-
-
+
+
退出登录
@@ -133,6 +150,7 @@
overflow: auto;
}
}
+
::v-deep(.van-popup__close-icon) {
color: #000 !important;
}
diff --git a/src/views/mobile/device/add.vue b/src/views/mobile/device/add.vue
index b803105..94242db 100644
--- a/src/views/mobile/device/add.vue
+++ b/src/views/mobile/device/add.vue
@@ -798,7 +798,7 @@
const loadingProduct = ref(true)
const fetchDict = () => {
getProductListPage({ offset: 1, limit: 9999 }).then(res => {
- productColumns.value = res.data.rows.map((item: any) => ({
+ productColumns.value = res.data.rows.filter((item: any) => userInfo.avatar.includes(item.manufacturerId)).map((item: any) => ({
text: `${item.productName}-${item.productCode}`,
value: item.id,
deviceType: item.deviceType,
@@ -1107,7 +1107,7 @@
+ input-align="right" @blur="valiateDevcode" clearable :rules="[{ required: true, message: '输入设备编号' }]" />
-
+
@@ -359,7 +359,8 @@
+ :selectable="selectable" header-cell-class-name="all-select" class="all-select" />
+
- {{ info.ts ? info.ts : info.alarmTime }}
+ {{ info.alarmTime }}
占位
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index f5b0ac9..130a012 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -8,6 +8,7 @@
import indexDB from '@/utils/indexDB'
import { decrypt, isEncrypt } from '@/utils/security1'
import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95, fetchCacheVideo, fetchCacheLeak } from '@/utils/sessionData'
+import { ElMessage } from 'element-plus'
const useUserStore = defineStore(
// 唯一ID
'user',
@@ -94,6 +95,7 @@
this.token = res.data.token
this.isLogout = 0
resolve()
+
}).catch((error) => {
reject(error)
})
@@ -148,6 +150,51 @@
getUserInfo() {
return new Promise((resolve) => {
getInfo().then((res) => {
+ const hanlder = () => {
+ this.isLogout += 1
+ const routeStore = useRouteStore()
+ const menuStore = useMenuStore()
+ localStorage.removeItem('username')
+ localStorage.removeItem('token')
+ localStorage.removeItem('nameId')
+ localStorage.removeItem('depId')
+ this.username = ''
+ this.token = ''
+ this.roleList = []
+ this.roleNames = []
+ this.dataScope = []
+ routeStore.removeRoutes()
+ menuStore.setActived(0)
+ menuStore.resetBreadcrumb()
+ }
+ if (window.localStorage.getItem('browser-type-bj-well') === 'pc') {
+ // pc端
+ if (res.data.avatar && !res.data.avatar.includes('.')) {
+ reject('厂商账号，不允许跨系统登录')
+ // 这是移动端账号，不让登录pc
+ hanlder()
+ ElMessage.error('厂商账号，不允许跨系统登录')
+ // 刷新页面
+ setTimeout(() => {
+ window.location.reload()
+ }, 1000);
+ return
+ }
+ }
+ else {
+ // 移动端
+ if (!res.data.avatar || res.data.avatar.includes('.')) {
+ reject('只允许厂商账号登录')
+ hanlder()
+ ElMessage.error('只允许厂商账号登录')
+ // 刷新页面
+ setTimeout(() => {
+ window.location.reload()
+ }, 1000);
+ }
+ }
+
+
if (res.data.roleIds && res.data.roleIds.length > 0) {
this.roleList = res.data.roleIds
this.roleNames = res.data.roleNames
@@ -167,6 +214,7 @@
reject('该用户无组织机构')
}
this.id = res.data.id
+ this.avatar = res.data.avatar
this.username = res.data.account
this.name = isEncrypt(res.data.name) ? decrypt(res.data.name) : res.data.name
resolve(res.data)
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index e816270..d351b24 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -271,9 +271,9 @@
}
// 全局报警弹窗跳转过来
if ($route.query.type === 'alarm-dialog') {
- obj.begTime = row.ts ? row.ts : row.alarmTime
- obj.endTime = row.ts ? row.ts : row.alarmTime
- datetimerange.value = [row.ts ? row.ts : row.alarmTime, row.ts ? row.ts : row.alarmTime]
+ obj.begTime = row.alarmTime
+ obj.endTime = row.alarmTime
+ datetimerange.value = [row.alarmTime, row.alarmTime]
obj.position = row.tagNumber
listQuery.value.position = row.tagNumber
// alarmTypeList.value
diff --git a/src/views/home/dashboard/deviceMonitor.vue b/src/views/home/dashboard/deviceMonitor.vue
index 046b750..863d853 100644
--- a/src/views/home/dashboard/deviceMonitor.vue
+++ b/src/views/home/dashboard/deviceMonitor.vue
@@ -782,7 +782,7 @@
value: '2',
},
{
- name: '放外力破坏',
+ name: '防外力破坏',
url: `${publicPath}/image/force/force-normal.png`,
value: '2',
},
diff --git a/src/views/home/force/components/map.vue b/src/views/home/force/components/map.vue
index e4883cf..d91dec6 100644
--- a/src/views/home/force/components/map.vue
+++ b/src/views/home/force/components/map.vue
@@ -1,5 +1,5 @@
diff --git a/src/views/home/force/index.vue b/src/views/home/force/index.vue
index 1f78b44..197fddd 100644
--- a/src/views/home/force/index.vue
+++ b/src/views/home/force/index.vue
@@ -1,5 +1,5 @@
diff --git a/src/views/home/well/components/map.vue b/src/views/home/well/components/map.vue
index 7a3c137..ef41d60 100644
--- a/src/views/home/well/components/map.vue
+++ b/src/views/home/well/components/map.vue
@@ -4,7 +4,6 @@
Date: 2023-07-08
-->
@@ -57,8 +73,9 @@
-
-
+
+
退出登录
@@ -133,6 +150,7 @@
overflow: auto;
}
}
+
::v-deep(.van-popup__close-icon) {
color: #000 !important;
}
diff --git a/src/views/mobile/device/add.vue b/src/views/mobile/device/add.vue
index b803105..94242db 100644
--- a/src/views/mobile/device/add.vue
+++ b/src/views/mobile/device/add.vue
@@ -798,7 +798,7 @@
const loadingProduct = ref(true)
const fetchDict = () => {
getProductListPage({ offset: 1, limit: 9999 }).then(res => {
- productColumns.value = res.data.rows.map((item: any) => ({
+ productColumns.value = res.data.rows.filter((item: any) => userInfo.avatar.includes(item.manufacturerId)).map((item: any) => ({
text: `${item.productName}-${item.productCode}`,
value: item.id,
deviceType: item.deviceType,
@@ -1107,7 +1107,7 @@
+ input-align="right" @blur="valiateDevcode" clearable :rules="[{ required: true, message: '输入设备编号' }]" />
import { getInfoListPage } from '@/api/mobile/info'
import { keepSearchParams } from '@/utils/keepQuery'
-import { throttle } from 'lodash-es'
+import useUserStore from '@/store/modules/user'
import dayjs from 'dayjs'
const $router = useRouter()
const $route = useRoute()
-
+const userInfo = useUserStore()
const total = ref(0)
const list = ref([])
const offset = ref(1)
@@ -43,7 +43,7 @@
const fetchData = () => {
// 查询条件
const query = JSON.parse($route.query.row as string)
- getInfoListPage({ ...query, keys: `${query.tagNumber}${query.keys}`, tagNumber: undefined, offset: offset.value, limit: 20 }).then(res => {
+ getInfoListPage({ ...query, keys: `${query.tagNumber}${query.keys}`, tagNumber: undefined, offset: offset.value, limit: 20, manufactureIds: userInfo.avatar }).then(res => {
total.value = res.data.total
list.value = [...list.value, ...res.data.rows]
list.value = list.value.map((item) => ({ ...item, installDate: item.installDate ? dayjs().format('YYYY-MM-DD') : '' }))
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3dfbab9..87c30b8 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -27,7 +27,7 @@
dayjs: ^1.11.6
echarts: ^5.4.1
echarts-gl: ^2.0.8
- element-plus: ^2.7.8
+ element-plus: ^2.9.7
eslint: ^8.27.0
esno: ^0.16.3
file-saver: ^2.0.5
@@ -95,7 +95,7 @@
dayjs: 1.11.13
echarts: 5.5.1
echarts-gl: 2.0.9_echarts@5.5.1
- element-plus: 2.9.1_vue@3.5.13
+ element-plus: 2.9.7_vue@3.5.13
file-saver: 2.0.5
hotkeys-js: 3.13.9
html2canvas: 1.4.1
@@ -3335,8 +3335,8 @@
resolution: {integrity: sha512-CjVQyG7n7Sr+eBXE86HIulnL5N8xZY1sgmOPGuq/F0Rr0FJq63lg0kEtOIDfZBk44FnDLf6FUJ+dsJcuiUDdDQ==}
dev: true
- /element-plus/2.9.1_vue@3.5.13:
- resolution: {integrity: sha512-9Agqf/jt4Ugk7EZ6C5LME71sgkvauPCsnvJN12Xid2XVobjufxMGpRE4L7pS4luJMOmFAH3J0NgYEGZT5r+NDg==}
+ /element-plus/2.9.7_vue@3.5.13:
+ resolution: {integrity: sha512-6vjZh5SXBncLhUwJGTVKS5oDljfgGMh6J4zVTeAZK3YdMUN76FgpvHkwwFXocpJpMbii6rDYU3sgie64FyPerQ==}
peerDependencies:
vue: ^3.2.0
dependencies:
diff --git a/public/config/config.json b/public/config/config.json
index d60ba89..b7ba181 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
{
"title":"感知数据汇聚平台",
- "baseUrl": "http://111.198.10.15:11643",
+ "baseUrl": "http://111.198.10.15:11646",
"securityJsCode": "56bf9671d4b3517d294caec4751889a1",
"JsKey": "40849e82b4e33f5255b17372520c954d",
"xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
@@ -27,5 +27,5 @@
},
"version": "1.0.1",
"node": "16.18.1",
- "mode": "windows"
+ "mode": "mobile"
}
diff --git a/src/api/home/force/index.ts b/src/api/home/force/index.ts
index 132d029..2023e60 100644
--- a/src/api/home/force/index.ts
+++ b/src/api/home/force/index.ts
@@ -1,5 +1,5 @@
/**
- * 放外力破坏监测
+ * 防外力破坏监测
*/
import request from '@/api/index'
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index e41ba6a..9a3bc91 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -351,7 +351,7 @@
@filter-change="filterChange" @row-contextmenu="contextmenu" @sort-change="sortClick"
:row-class-name="props.tableRowClassName"
>
-
+
@@ -359,7 +359,8 @@
+ :selectable="selectable" header-cell-class-name="all-select" class="all-select" />
+
- {{ info.ts ? info.ts : info.alarmTime }}
+ {{ info.alarmTime }}
占位
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index f5b0ac9..130a012 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -8,6 +8,7 @@
import indexDB from '@/utils/indexDB'
import { decrypt, isEncrypt } from '@/utils/security1'
import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95, fetchCacheVideo, fetchCacheLeak } from '@/utils/sessionData'
+import { ElMessage } from 'element-plus'
const useUserStore = defineStore(
// 唯一ID
'user',
@@ -94,6 +95,7 @@
this.token = res.data.token
this.isLogout = 0
resolve()
+
}).catch((error) => {
reject(error)
})
@@ -148,6 +150,51 @@
getUserInfo() {
return new Promise((resolve) => {
getInfo().then((res) => {
+ const hanlder = () => {
+ this.isLogout += 1
+ const routeStore = useRouteStore()
+ const menuStore = useMenuStore()
+ localStorage.removeItem('username')
+ localStorage.removeItem('token')
+ localStorage.removeItem('nameId')
+ localStorage.removeItem('depId')
+ this.username = ''
+ this.token = ''
+ this.roleList = []
+ this.roleNames = []
+ this.dataScope = []
+ routeStore.removeRoutes()
+ menuStore.setActived(0)
+ menuStore.resetBreadcrumb()
+ }
+ if (window.localStorage.getItem('browser-type-bj-well') === 'pc') {
+ // pc端
+ if (res.data.avatar && !res.data.avatar.includes('.')) {
+ reject('厂商账号，不允许跨系统登录')
+ // 这是移动端账号，不让登录pc
+ hanlder()
+ ElMessage.error('厂商账号，不允许跨系统登录')
+ // 刷新页面
+ setTimeout(() => {
+ window.location.reload()
+ }, 1000);
+ return
+ }
+ }
+ else {
+ // 移动端
+ if (!res.data.avatar || res.data.avatar.includes('.')) {
+ reject('只允许厂商账号登录')
+ hanlder()
+ ElMessage.error('只允许厂商账号登录')
+ // 刷新页面
+ setTimeout(() => {
+ window.location.reload()
+ }, 1000);
+ }
+ }
+
+
if (res.data.roleIds && res.data.roleIds.length > 0) {
this.roleList = res.data.roleIds
this.roleNames = res.data.roleNames
@@ -167,6 +214,7 @@
reject('该用户无组织机构')
}
this.id = res.data.id
+ this.avatar = res.data.avatar
this.username = res.data.account
this.name = isEncrypt(res.data.name) ? decrypt(res.data.name) : res.data.name
resolve(res.data)
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index e816270..d351b24 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -271,9 +271,9 @@
}
// 全局报警弹窗跳转过来
if ($route.query.type === 'alarm-dialog') {
- obj.begTime = row.ts ? row.ts : row.alarmTime
- obj.endTime = row.ts ? row.ts : row.alarmTime
- datetimerange.value = [row.ts ? row.ts : row.alarmTime, row.ts ? row.ts : row.alarmTime]
+ obj.begTime = row.alarmTime
+ obj.endTime = row.alarmTime
+ datetimerange.value = [row.alarmTime, row.alarmTime]
obj.position = row.tagNumber
listQuery.value.position = row.tagNumber
// alarmTypeList.value
diff --git a/src/views/home/dashboard/deviceMonitor.vue b/src/views/home/dashboard/deviceMonitor.vue
index 046b750..863d853 100644
--- a/src/views/home/dashboard/deviceMonitor.vue
+++ b/src/views/home/dashboard/deviceMonitor.vue
@@ -782,7 +782,7 @@
value: '2',
},
{
- name: '放外力破坏',
+ name: '防外力破坏',
url: `${publicPath}/image/force/force-normal.png`,
value: '2',
},
diff --git a/src/views/home/force/components/map.vue b/src/views/home/force/components/map.vue
index e4883cf..d91dec6 100644
--- a/src/views/home/force/components/map.vue
+++ b/src/views/home/force/components/map.vue
@@ -1,5 +1,5 @@
diff --git a/src/views/home/force/index.vue b/src/views/home/force/index.vue
index 1f78b44..197fddd 100644
--- a/src/views/home/force/index.vue
+++ b/src/views/home/force/index.vue
@@ -1,5 +1,5 @@
diff --git a/src/views/home/well/components/map.vue b/src/views/home/well/components/map.vue
index 7a3c137..ef41d60 100644
--- a/src/views/home/well/components/map.vue
+++ b/src/views/home/well/components/map.vue
@@ -4,7 +4,6 @@
Date: 2023-07-08
-->
@@ -57,8 +73,9 @@
-
-
+
+
退出登录
@@ -133,6 +150,7 @@
overflow: auto;
}
}
+
::v-deep(.van-popup__close-icon) {
color: #000 !important;
}
diff --git a/src/views/mobile/device/add.vue b/src/views/mobile/device/add.vue
index b803105..94242db 100644
--- a/src/views/mobile/device/add.vue
+++ b/src/views/mobile/device/add.vue
@@ -798,7 +798,7 @@
const loadingProduct = ref(true)
const fetchDict = () => {
getProductListPage({ offset: 1, limit: 9999 }).then(res => {
- productColumns.value = res.data.rows.map((item: any) => ({
+ productColumns.value = res.data.rows.filter((item: any) => userInfo.avatar.includes(item.manufacturerId)).map((item: any) => ({
text: `${item.productName}-${item.productCode}`,
value: item.id,
deviceType: item.deviceType,
@@ -1107,7 +1107,7 @@
+ input-align="right" @blur="valiateDevcode" clearable :rules="[{ required: true, message: '输入设备编号' }]" />
import { getInfoListPage } from '@/api/mobile/info'
import { keepSearchParams } from '@/utils/keepQuery'
-import { throttle } from 'lodash-es'
+import useUserStore from '@/store/modules/user'
import dayjs from 'dayjs'
const $router = useRouter()
const $route = useRoute()
-
+const userInfo = useUserStore()
const total = ref(0)
const list = ref([])
const offset = ref(1)
@@ -43,7 +43,7 @@
const fetchData = () => {
// 查询条件
const query = JSON.parse($route.query.row as string)
- getInfoListPage({ ...query, keys: `${query.tagNumber}${query.keys}`, tagNumber: undefined, offset: offset.value, limit: 20 }).then(res => {
+ getInfoListPage({ ...query, keys: `${query.tagNumber}${query.keys}`, tagNumber: undefined, offset: offset.value, limit: 20, manufactureIds: userInfo.avatar }).then(res => {
total.value = res.data.total
list.value = [...list.value, ...res.data.rows]
list.value = list.value.map((item) => ({ ...item, installDate: item.installDate ? dayjs().format('YYYY-MM-DD') : '' }))
diff --git a/src/views/mobile/operation/data.vue b/src/views/mobile/operation/data.vue
index a1408a1..1073d93 100644
--- a/src/views/mobile/operation/data.vue
+++ b/src/views/mobile/operation/data.vue
@@ -6,8 +6,11 @@
@@ -57,8 +73,9 @@
-
-
+
+
退出登录
@@ -133,6 +150,7 @@
overflow: auto;
}
}
+
::v-deep(.van-popup__close-icon) {
color: #000 !important;
}
diff --git a/src/views/mobile/device/add.vue b/src/views/mobile/device/add.vue
index b803105..94242db 100644
--- a/src/views/mobile/device/add.vue
+++ b/src/views/mobile/device/add.vue
@@ -798,7 +798,7 @@
const loadingProduct = ref(true)
const fetchDict = () => {
getProductListPage({ offset: 1, limit: 9999 }).then(res => {
- productColumns.value = res.data.rows.map((item: any) => ({
+ productColumns.value = res.data.rows.filter((item: any) => userInfo.avatar.includes(item.manufacturerId)).map((item: any) => ({
text: `${item.productName}-${item.productCode}`,
value: item.id,
deviceType: item.deviceType,
@@ -1107,7 +1107,7 @@
+ input-align="right" @blur="valiateDevcode" clearable :rules="[{ required: true, message: '输入设备编号' }]" />
import { getInfoListPage } from '@/api/mobile/info'
import { keepSearchParams } from '@/utils/keepQuery'
-import { throttle } from 'lodash-es'
+import useUserStore from '@/store/modules/user'
import dayjs from 'dayjs'
const $router = useRouter()
const $route = useRoute()
-
+const userInfo = useUserStore()
const total = ref(0)
const list = ref([])
const offset = ref(1)
@@ -43,7 +43,7 @@
const fetchData = () => {
// 查询条件
const query = JSON.parse($route.query.row as string)
- getInfoListPage({ ...query, keys: `${query.tagNumber}${query.keys}`, tagNumber: undefined, offset: offset.value, limit: 20 }).then(res => {
+ getInfoListPage({ ...query, keys: `${query.tagNumber}${query.keys}`, tagNumber: undefined, offset: offset.value, limit: 20, manufactureIds: userInfo.avatar }).then(res => {
total.value = res.data.total
list.value = [...list.value, ...res.data.rows]
list.value = list.value.map((item) => ({ ...item, installDate: item.installDate ? dayjs().format('YYYY-MM-DD') : '' }))
diff --git a/src/views/mobile/operation/data.vue b/src/views/mobile/operation/data.vue
index a1408a1..1073d93 100644
--- a/src/views/mobile/operation/data.vue
+++ b/src/views/mobile/operation/data.vue
@@ -6,8 +6,11 @@
@@ -57,8 +73,9 @@
-
-
+
+
退出登录
@@ -133,6 +150,7 @@
overflow: auto;
}
}
+
::v-deep(.van-popup__close-icon) {
color: #000 !important;
}
diff --git a/src/views/mobile/device/add.vue b/src/views/mobile/device/add.vue
index b803105..94242db 100644
--- a/src/views/mobile/device/add.vue
+++ b/src/views/mobile/device/add.vue
@@ -798,7 +798,7 @@
const loadingProduct = ref(true)
const fetchDict = () => {
getProductListPage({ offset: 1, limit: 9999 }).then(res => {
- productColumns.value = res.data.rows.map((item: any) => ({
+ productColumns.value = res.data.rows.filter((item: any) => userInfo.avatar.includes(item.manufacturerId)).map((item: any) => ({
text: `${item.productName}-${item.productCode}`,
value: item.id,
deviceType: item.deviceType,
@@ -1107,7 +1107,7 @@
+ input-align="right" @blur="valiateDevcode" clearable :rules="[{ required: true, message: '输入设备编号' }]" />
import { getInfoListPage } from '@/api/mobile/info'
import { keepSearchParams } from '@/utils/keepQuery'
-import { throttle } from 'lodash-es'
+import useUserStore from '@/store/modules/user'
import dayjs from 'dayjs'
const $router = useRouter()
const $route = useRoute()
-
+const userInfo = useUserStore()
const total = ref(0)
const list = ref([])
const offset = ref(1)
@@ -43,7 +43,7 @@
const fetchData = () => {
// 查询条件
const query = JSON.parse($route.query.row as string)
- getInfoListPage({ ...query, keys: `${query.tagNumber}${query.keys}`, tagNumber: undefined, offset: offset.value, limit: 20 }).then(res => {
+ getInfoListPage({ ...query, keys: `${query.tagNumber}${query.keys}`, tagNumber: undefined, offset: offset.value, limit: 20, manufactureIds: userInfo.avatar }).then(res => {
total.value = res.data.total
list.value = [...list.value, ...res.data.rows]
list.value = list.value.map((item) => ({ ...item, installDate: item.installDate ? dayjs().format('YYYY-MM-DD') : '' }))
diff --git a/src/views/mobile/operation/data.vue b/src/views/mobile/operation/data.vue
index a1408a1..1073d93 100644
--- a/src/views/mobile/operation/data.vue
+++ b/src/views/mobile/operation/data.vue
@@ -6,8 +6,11 @@
@@ -57,8 +73,9 @@
-
-
+
+
退出登录
@@ -133,6 +150,7 @@
overflow: auto;
}
}
+
::v-deep(.van-popup__close-icon) {
color: #000 !important;
}
diff --git a/src/views/mobile/device/add.vue b/src/views/mobile/device/add.vue
index b803105..94242db 100644
--- a/src/views/mobile/device/add.vue
+++ b/src/views/mobile/device/add.vue
@@ -798,7 +798,7 @@
const loadingProduct = ref(true)
const fetchDict = () => {
getProductListPage({ offset: 1, limit: 9999 }).then(res => {
- productColumns.value = res.data.rows.map((item: any) => ({
+ productColumns.value = res.data.rows.filter((item: any) => userInfo.avatar.includes(item.manufacturerId)).map((item: any) => ({
text: `${item.productName}-${item.productCode}`,
value: item.id,
deviceType: item.deviceType,
@@ -1107,7 +1107,7 @@
+ input-align="right" @blur="valiateDevcode" clearable :rules="[{ required: true, message: '输入设备编号' }]" />
import { getInfoListPage } from '@/api/mobile/info'
import { keepSearchParams } from '@/utils/keepQuery'
-import { throttle } from 'lodash-es'
+import useUserStore from '@/store/modules/user'
import dayjs from 'dayjs'
const $router = useRouter()
const $route = useRoute()
-
+const userInfo = useUserStore()
const total = ref(0)
const list = ref([])
const offset = ref(1)
@@ -43,7 +43,7 @@
const fetchData = () => {
// 查询条件
const query = JSON.parse($route.query.row as string)
- getInfoListPage({ ...query, keys: `${query.tagNumber}${query.keys}`, tagNumber: undefined, offset: offset.value, limit: 20 }).then(res => {
+ getInfoListPage({ ...query, keys: `${query.tagNumber}${query.keys}`, tagNumber: undefined, offset: offset.value, limit: 20, manufactureIds: userInfo.avatar }).then(res => {
total.value = res.data.total
list.value = [...list.value, ...res.data.rows]
list.value = list.value.map((item) => ({ ...item, installDate: item.installDate ? dayjs().format('YYYY-MM-DD') : '' }))
diff --git a/src/views/mobile/operation/data.vue b/src/views/mobile/operation/data.vue
index a1408a1..1073d93 100644
--- a/src/views/mobile/operation/data.vue
+++ b/src/views/mobile/operation/data.vue
@@ -6,8 +6,11 @@
@@ -57,8 +73,9 @@
-
-
+
+
退出登录
@@ -133,6 +150,7 @@
overflow: auto;
}
}
+
::v-deep(.van-popup__close-icon) {
color: #000 !important;
}
diff --git a/src/views/mobile/device/add.vue b/src/views/mobile/device/add.vue
index b803105..94242db 100644
--- a/src/views/mobile/device/add.vue
+++ b/src/views/mobile/device/add.vue
@@ -798,7 +798,7 @@
const loadingProduct = ref(true)
const fetchDict = () => {
getProductListPage({ offset: 1, limit: 9999 }).then(res => {
- productColumns.value = res.data.rows.map((item: any) => ({
+ productColumns.value = res.data.rows.filter((item: any) => userInfo.avatar.includes(item.manufacturerId)).map((item: any) => ({
text: `${item.productName}-${item.productCode}`,
value: item.id,
deviceType: item.deviceType,
@@ -1107,7 +1107,7 @@
+ input-align="right" @blur="valiateDevcode" clearable :rules="[{ required: true, message: '输入设备编号' }]" />
import { getInfoListPage } from '@/api/mobile/info'
import { keepSearchParams } from '@/utils/keepQuery'
-import { throttle } from 'lodash-es'
+import useUserStore from '@/store/modules/user'
import dayjs from 'dayjs'
const $router = useRouter()
const $route = useRoute()
-
+const userInfo = useUserStore()
const total = ref(0)
const list = ref([])
const offset = ref(1)
@@ -43,7 +43,7 @@
const fetchData = () => {
// 查询条件
const query = JSON.parse($route.query.row as string)
- getInfoListPage({ ...query, keys: `${query.tagNumber}${query.keys}`, tagNumber: undefined, offset: offset.value, limit: 20 }).then(res => {
+ getInfoListPage({ ...query, keys: `${query.tagNumber}${query.keys}`, tagNumber: undefined, offset: offset.value, limit: 20, manufactureIds: userInfo.avatar }).then(res => {
total.value = res.data.total
list.value = [...list.value, ...res.data.rows]
list.value = list.value.map((item) => ({ ...item, installDate: item.installDate ? dayjs().format('YYYY-MM-DD') : '' }))
diff --git a/src/views/mobile/operation/data.vue b/src/views/mobile/operation/data.vue
index a1408a1..1073d93 100644
--- a/src/views/mobile/operation/data.vue
+++ b/src/views/mobile/operation/data.vue
@@ -6,8 +6,11 @@