+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/deviceManage/components/listHydrantData.vue b/src/views/deviceManage/components/listHydrantData.vue
index 8ba6cee..823201e 100644
--- a/src/views/deviceManage/components/listHydrantData.vue
+++ b/src/views/deviceManage/components/listHydrantData.vue
@@ -63,13 +63,13 @@
needIndex: false
}, // 是否需要序号列
columns: [
- { text: '上报时间', value: 'logTime', align: 'center' },
+ { text: '上报时间', value: 'logtime', align: 'center' },
{ text: '消防栓状态', value: 'descn', align: 'center' }
], // 显示列
headConfig: {
show: false
}, // 表格头配置
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listLiquidData.vue b/src/views/deviceManage/components/listLiquidData.vue
index 3b77db0..3bae830 100644
--- a/src/views/deviceManage/components/listLiquidData.vue
+++ b/src/views/deviceManage/components/listLiquidData.vue
@@ -69,7 +69,7 @@
{ text: '上报时间', value: 'uptime', align: 'center' },
{ text: '液位值', value: 'liquiddata', align: 'center' }
], // 显示列
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listNoiseData.vue b/src/views/deviceManage/components/listNoiseData.vue
index 1fb0f32..bc1024d 100644
--- a/src/views/deviceManage/components/listNoiseData.vue
+++ b/src/views/deviceManage/components/listNoiseData.vue
@@ -69,7 +69,7 @@
{ text: '上报时间', value: 'uptime', align: 'center' },
{ text: '噪声值', value: 'ddata', align: 'center' }
], // 显示列
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listTempData.vue b/src/views/deviceManage/components/listTempData.vue
index bf8136e..d2e6272 100644
--- a/src/views/deviceManage/components/listTempData.vue
+++ b/src/views/deviceManage/components/listTempData.vue
@@ -22,7 +22,15 @@
+
+
+ 设备数据情况
+
+
+
+
+
+
+
+
+
+ 温度
+
+
+ 湿度
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/package.json b/package.json
index 08fc1f3..4b4e458 100644
--- a/package.json
+++ b/package.json
@@ -11,6 +11,7 @@
},
"dependencies": {
"@amap/amap-jsapi-loader": "^1.0.1",
+ "@jiaminghi/data-view": "^2.10.0",
"@riophae/vue-treeselect": "^0.4.0",
"animate.css": "^4.1.1",
"axios": "^0.21.1",
@@ -29,6 +30,7 @@
"nprogress": "^0.2.0",
"uppercamelcase": "^3.0.0",
"v-charts": "^1.19.0",
+ "v-viewer": "^1.6.4",
"vue": "^2.6.11",
"vue-amap": "^0.5.10",
"vue-router": "^3.2.0",
diff --git a/src/api/data/data.js b/src/api/data/data.js
index d87e74a..c437d7b 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -97,7 +97,7 @@
// 管盯数据查询
export function getTubeData(params) {
return request({
- url: 'tubedata/list',
+ url: 'tubedata/list-page',
method: 'get',
params
})
diff --git a/src/main.js b/src/main.js
index cb309a1..1ceea3c 100644
--- a/src/main.js
+++ b/src/main.js
@@ -38,6 +38,11 @@
// 引入v-charts
import VCharts from 'v-charts'
Vue.use(VCharts)
+
+// 引入datav
+import dataV from '@jiaminghi/data-view'
+Vue.use(dataV)
+
// 引入音频文件
import audio from '@/assets/audio/alarm.mp3'
diff --git a/src/permission.js b/src/permission.js
index 96e5f73..ea80a31 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -3,9 +3,10 @@
import NProgress from 'nprogress' // progress bar 进度条
import 'nprogress/nprogress.css' // progress bar style 进度条样式
// import { Message } from 'element-ui'
-import { getToken } from '@/utils/auth' // getToken from cookie
-import { loginByToken, isSubSystem, sysCode } from './settings'
+import { getToken, getUser, setUser } from '@/utils/auth' // getToken from cookie
+import { loginByToken, isSubSystem, sysCode, loginByUsername } from './settings'
import Vue from 'vue'
+import { RSAencrypt } from '@/utils/security'
NProgress.configure({ showSpinner: false })// NProgress configuration
@@ -27,70 +28,89 @@
}).catch(() => {
next('/401') // 否则全部重定向到401没有权限页面
})
- }
- // 如果cookie中已有token，直接进行下一步
- if (oldToken) {
- // 登录后进入登录页
- if (to.path === '/login') {
- next({ path: '/' })
- NProgress.done() // if current page is dashboard will not trigger afterEach hook, so manually handle it
+ } else {
+ // 如果链接中有用户名和密码
+ const oldUser = getUser()
+ const username = to.query.username
+ const password = to.query.pwd
+ debugger
+ if (loginByUsername && username && password && !oldUser) { // 登陆后跳转
+ const loginForm = {
+ username: username,
+ password: RSAencrypt(password)
+ }
+ store.dispatch('Login', loginForm).then(() => {
+ setUser(username)
+ next({ ...to, replace: true }) // 登录成功继续
+ }).catch(() => {
+ next('/401') // 否则全部重定向到401没有权限页面
+ })
} else {
- // 当进入非登陆页时
- if (store.getters.roleList && store.getters.roleList.length === 0) { // 判断当前用户是否已拉取完user_info信息
- try {
- store.dispatch('GetInfo').then(() => {
- // 如果是子系统，参数为setting文件中的sysCode属性
- if (isSubSystem) {
- store.dispatch('GetMenus', { code: sysCode }).then((accessRoute) => {
- router.addRoutes(accessRoute)
- next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+ // 如果cookie中已有token，直接进行下一步
+ if (oldToken) {
+ // 登录后进入登录页
+ if (to.path === '/login') {
+ next({ path: '/' })
+ NProgress.done() // if current page is dashboard will not trigger afterEach hook, so manually handle it
+ } else {
+ // 当进入非登陆页时
+ if (store.getters.roleList && store.getters.roleList.length === 0) { // 判断当前用户是否已拉取完user_info信息
+ try {
+ store.dispatch('GetInfo').then(() => {
+ // 如果是子系统，参数为setting文件中的sysCode属性
+ if (isSubSystem) {
+ store.dispatch('GetMenus', { code: sysCode }).then((accessRoute) => {
+ router.addRoutes(accessRoute)
+ next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+ })
+ } else { // 否则直接获取全部菜单权限
+ store.dispatch('GetMenus').then((accessRoute) => {
+ router.addRoutes(accessRoute)
+ next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+ })
+ }
})
- } else { // 否则直接获取全部菜单权限
- store.dispatch('GetMenus').then((accessRoute) => {
- router.addRoutes(accessRoute)
- next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+ } catch (err) {
+ store.dispatch('FedLogOut').then(() => {
+ // Message.error(err || '权限验证失败，请重新登录系统')
+ next({ path: '/' })
})
}
- })
- } catch (err) {
- store.dispatch('FedLogOut').then(() => {
- // Message.error(err || '权限验证失败，请重新登录系统')
- next({ path: '/' })
- })
+ } else { // 角色不为空
+ next()
+ }
}
- } else { // 角色不为空
- next()
- }
- }
- } else {
- // has no token
- // 免登录白名单，直接进入
- if (whiteList.indexOf(to.path) !== -1) {
- next()
- } else {
- // 如果允许通过链接上的token登录
- // 获取链接里的token
- const token = to.query.token
- console.log('form other system token:' + to.query.token)
- if (loginByToken && token) {
- // 调用自动登录接口，否则跳转到登录页
- store.dispatch('TokenLogin', token).then(() => {
- console.log('自动登录成功')
- console.log(to.path)
- next({ ...to, replace: true }) // 登录成功继续
- }).catch(() => {
- next('/401') // 否则全部重定向到401没有权限页面
- })
} else {
- // 判断是独立运行的子系统还是和其他基础子系统一起的
- const config = Vue.prototype.baseConfig
- if (config.singleSys) {
- next(`/login`) // 重定向到本系统登录页
- } else { // 跳转到配置的主页
- window.location.href = config.mainPage
+ // has no token
+ // 免登录白名单，直接进入
+ if (whiteList.indexOf(to.path) !== -1) {
+ next()
+ } else {
+ // 如果允许通过链接上的token登录
+ // 获取链接里的token
+ const token = to.query.token
+ console.log('form other system token:' + to.query.token)
+ if (loginByToken && token) {
+ // 调用自动登录接口，否则跳转到登录页
+ store.dispatch('TokenLogin', token).then(() => {
+ console.log('自动登录成功')
+ console.log(to.path)
+ next({ ...to, replace: true }) // 登录成功继续
+ }).catch(() => {
+ next('/401') // 否则全部重定向到401没有权限页面
+ })
+ } else {
+ // 判断是独立运行的子系统还是和其他基础子系统一起的
+ const config = Vue.prototype.baseConfig
+ if (config.singleSys) {
+ next(`/login`) // 重定向到本系统登录页
+ } else { // 跳转到配置的主页
+ window.location.href = config.mainPage
+ }
+ }
+ NProgress.done()
}
}
- NProgress.done()
}
}
})
diff --git a/src/router/index.js b/src/router/index.js
index 4935f4a..e247d73 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -42,8 +42,12 @@
},
// 登录页面
{ path: '/login', component: () => import('@/views/login/index_2'), hidden: true },
- // 3d地图
+ // 3d地图-赣州
{ path: '/3doverview', component: () => import('@/views/overview/overview3d'), hidden: true },
+ // 章丘地图页
+ { path: '/3doverviewzq', component: () => import('@/views/overview/overview3dzq'), hidden: true },
+ // 章丘首页
+ { path: '/zqindex', component: () => import('@/views/zhangqiu/zqindex'), hidden: true },
// 404错误页面
{ path: '/404', component: () => import('@/views/errorPage/404'), hidden: true },
// 401 错误页面
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index c33329b..eccd5c6 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -13,10 +13,10 @@
},
children: [
{
- path: '/tenantConfig',
- name: 'TenantConfig',
- component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
- meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
+ path: '/responsibleUser',
+ name: 'ResponsibleUser',
+ component: () => import('@/views/systemConfig/responsibleUser/listResponsibleUser'),
+ meta: { title: '联系人配置', icon: 'function', permission: ['/responsibleUser'] }
},
{
path: '/alarmConfig',
@@ -31,28 +31,16 @@
meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
},
{
- path: '/responsibleUser',
- name: 'ResponsibleUser',
- component: () => import('@/views/systemConfig/responsibleUser/listResponsibleUser'),
- meta: { title: '联系人配置', icon: 'function', permission: ['/responsibleUser'] }
- },
- {
- path: '/alarmLevel',
- name: 'AlarmLevel',
- component: () => import('@/views/systemConfig/alarmLevel/listLevel'),
- meta: { title: '告警等级配置', icon: 'function', permission: ['/alarmLevel'] }
- },
- {
- path: '/alarmContent',
- name: 'AlarmContent',
- component: () => import('@/views/systemConfig/alarmContent/listContent'),
- meta: { title: '告警内容配置', icon: 'function', permission: ['/alarmContent'] }
- },
- {
path: '/deptPermission',
name: 'DeptPermission',
component: () => import('@/views/systemConfig/deptPermission/deptPermission'),
meta: { title: '组织权限配置', icon: 'function', permission: ['/deptPermission/list'] }
+ },
+ {
+ path: '/tenantConfig',
+ name: 'TenantConfig',
+ component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
+ meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
}
]
}]
diff --git a/src/settings.js b/src/settings.js
index 58b4117..e639076 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -40,7 +40,12 @@
* @type {Boolean}
* @description 是否允许token登录
*/
- loginByToken: false,
+ loginByToken: true,
+ /**
+ * @type {Boolean}
+ * @description 是否允许用户名+密码登录
+ */
+ loginByUsername: true,
/**
* @type {Boolean},
* @description 是否是某个子系统
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 65691f6..28fee48 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -1,6 +1,7 @@
import Cookies from 'js-cookie'
const TokenKey = 'token' // token：cookie中
+const UserKey = 'user' // token：cookie中
const PublicKey = 'public_key' // 公钥：localStorage中
const CurrentSystem = 'current_system' // 当前系统，未必每个项目都有用：localStorage中
const WsUrl = 'ws_url'
@@ -17,6 +18,18 @@
return Cookies.remove(TokenKey)
}
+export function getUser() {
+ return Cookies.get(UserKey)
+}
+
+export function setUser(user) {
+ return Cookies.set(UserKey, user)
+}
+
+export function removeUser() {
+ return Cookies.remove(UserKey)
+}
+
export function getPublicKey() {
return window.localStorage.getItem(PublicKey)
}
diff --git a/src/views/dataManage/deviceData/listGasdectorData.vue b/src/views/dataManage/deviceData/listGasdectorData.vue
index b4ecd07..f16815e 100644
--- a/src/views/dataManage/deviceData/listGasdectorData.vue
+++ b/src/views/dataManage/deviceData/listGasdectorData.vue
@@ -86,8 +86,8 @@
{ text: '设备编号', value: 'devcode', align: 'center' },
{ text: '点位编号', value: 'wellCode', align: 'center' },
{ text: '设备类型', value: 'deviceTypeName', align: 'center' },
- { text: '可燃气体浓度(%LEL)', value: 'strength', align: 'center', filter: true },
- { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
+ { text: '可燃气体浓度(%LEL)', value: 'gasSampleValue', align: 'center', filter: true },
+ { text: '电量(%)', value: 'batteryValue', width: 80, align: 'center', checkCell: true },
// {text: '状态描述',value: 'descn', align: 'center'},
{ text: '权属单位', value: 'deptName', align: 'center' },
{ text: '上传时间', value: 'uptime', width: 170, align: 'center' }
diff --git a/src/views/dataManage/deviceData/listH2SData.vue b/src/views/dataManage/deviceData/listH2SData.vue
index 1dbe14d..9eb7af5 100644
--- a/src/views/dataManage/deviceData/listH2SData.vue
+++ b/src/views/dataManage/deviceData/listH2SData.vue
@@ -71,8 +71,6 @@
data() {
return {
listQuery: {
- devcode: '', // 设备编号
- wellCode: '', // 点位编号
beginTime: '', // 开始时间
endTime: '', // 结束时间
keywords: '', // 关键字
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index e0e6ab8..b56fb95 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -166,7 +166,7 @@
this.handleDateTime()
getTubeData(this.listQuery).then(response => {
this.list = response.data.rows
- this.total = parseInt(response.data.total)
+ this.total = response.data.total
this.listLoading = false
})
},
diff --git a/src/views/deviceManage/components/listDigData.vue b/src/views/deviceManage/components/listDigData.vue
index 1467b49..87e2b94 100644
--- a/src/views/deviceManage/components/listDigData.vue
+++ b/src/views/deviceManage/components/listDigData.vue
@@ -69,7 +69,7 @@
headConfig: {
show: false
}, // 表格头配置
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listGasData.vue b/src/views/deviceManage/components/listGasData.vue
index 0cdbb7d..372ef0e 100644
--- a/src/views/deviceManage/components/listGasData.vue
+++ b/src/views/deviceManage/components/listGasData.vue
@@ -69,7 +69,7 @@
{ text: '上报时间', value: 'uptime', align: 'center' },
{ text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
], // 显示列
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listGasDetectorData.vue b/src/views/deviceManage/components/listGasDetectorData.vue
new file mode 100644
index 0000000..2f282a1
--- /dev/null
+++ b/src/views/deviceManage/components/listGasDetectorData.vue
@@ -0,0 +1,155 @@
+
+
+
+
+ 设备数据情况
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/deviceManage/components/listHydrantData.vue b/src/views/deviceManage/components/listHydrantData.vue
index 8ba6cee..823201e 100644
--- a/src/views/deviceManage/components/listHydrantData.vue
+++ b/src/views/deviceManage/components/listHydrantData.vue
@@ -63,13 +63,13 @@
needIndex: false
}, // 是否需要序号列
columns: [
- { text: '上报时间', value: 'logTime', align: 'center' },
+ { text: '上报时间', value: 'logtime', align: 'center' },
{ text: '消防栓状态', value: 'descn', align: 'center' }
], // 显示列
headConfig: {
show: false
}, // 表格头配置
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listLiquidData.vue b/src/views/deviceManage/components/listLiquidData.vue
index 3b77db0..3bae830 100644
--- a/src/views/deviceManage/components/listLiquidData.vue
+++ b/src/views/deviceManage/components/listLiquidData.vue
@@ -69,7 +69,7 @@
{ text: '上报时间', value: 'uptime', align: 'center' },
{ text: '液位值', value: 'liquiddata', align: 'center' }
], // 显示列
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listNoiseData.vue b/src/views/deviceManage/components/listNoiseData.vue
index 1fb0f32..bc1024d 100644
--- a/src/views/deviceManage/components/listNoiseData.vue
+++ b/src/views/deviceManage/components/listNoiseData.vue
@@ -69,7 +69,7 @@
{ text: '上报时间', value: 'uptime', align: 'center' },
{ text: '噪声值', value: 'ddata', align: 'center' }
], // 显示列
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listTempData.vue b/src/views/deviceManage/components/listTempData.vue
index bf8136e..d2e6272 100644
--- a/src/views/deviceManage/components/listTempData.vue
+++ b/src/views/deviceManage/components/listTempData.vue
@@ -22,7 +22,15 @@
+
+
+ 设备数据情况
+
+
+
+
+
+
+
+
+
+ 温度
+
+
+ 湿度
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/deviceManage/components/listTubeData.vue b/src/views/deviceManage/components/listTubeData.vue
index 0bdd2bb..9cd3930 100644
--- a/src/views/deviceManage/components/listTubeData.vue
+++ b/src/views/deviceManage/components/listTubeData.vue
@@ -69,7 +69,7 @@
{ text: '上报时间', value: 'uptime', align: 'center' },
{ text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
], // 显示列
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/package.json b/package.json
index 08fc1f3..4b4e458 100644
--- a/package.json
+++ b/package.json
@@ -11,6 +11,7 @@
},
"dependencies": {
"@amap/amap-jsapi-loader": "^1.0.1",
+ "@jiaminghi/data-view": "^2.10.0",
"@riophae/vue-treeselect": "^0.4.0",
"animate.css": "^4.1.1",
"axios": "^0.21.1",
@@ -29,6 +30,7 @@
"nprogress": "^0.2.0",
"uppercamelcase": "^3.0.0",
"v-charts": "^1.19.0",
+ "v-viewer": "^1.6.4",
"vue": "^2.6.11",
"vue-amap": "^0.5.10",
"vue-router": "^3.2.0",
diff --git a/src/api/data/data.js b/src/api/data/data.js
index d87e74a..c437d7b 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -97,7 +97,7 @@
// 管盯数据查询
export function getTubeData(params) {
return request({
- url: 'tubedata/list',
+ url: 'tubedata/list-page',
method: 'get',
params
})
diff --git a/src/main.js b/src/main.js
index cb309a1..1ceea3c 100644
--- a/src/main.js
+++ b/src/main.js
@@ -38,6 +38,11 @@
// 引入v-charts
import VCharts from 'v-charts'
Vue.use(VCharts)
+
+// 引入datav
+import dataV from '@jiaminghi/data-view'
+Vue.use(dataV)
+
// 引入音频文件
import audio from '@/assets/audio/alarm.mp3'
diff --git a/src/permission.js b/src/permission.js
index 96e5f73..ea80a31 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -3,9 +3,10 @@
import NProgress from 'nprogress' // progress bar 进度条
import 'nprogress/nprogress.css' // progress bar style 进度条样式
// import { Message } from 'element-ui'
-import { getToken } from '@/utils/auth' // getToken from cookie
-import { loginByToken, isSubSystem, sysCode } from './settings'
+import { getToken, getUser, setUser } from '@/utils/auth' // getToken from cookie
+import { loginByToken, isSubSystem, sysCode, loginByUsername } from './settings'
import Vue from 'vue'
+import { RSAencrypt } from '@/utils/security'
NProgress.configure({ showSpinner: false })// NProgress configuration
@@ -27,70 +28,89 @@
}).catch(() => {
next('/401') // 否则全部重定向到401没有权限页面
})
- }
- // 如果cookie中已有token，直接进行下一步
- if (oldToken) {
- // 登录后进入登录页
- if (to.path === '/login') {
- next({ path: '/' })
- NProgress.done() // if current page is dashboard will not trigger afterEach hook, so manually handle it
+ } else {
+ // 如果链接中有用户名和密码
+ const oldUser = getUser()
+ const username = to.query.username
+ const password = to.query.pwd
+ debugger
+ if (loginByUsername && username && password && !oldUser) { // 登陆后跳转
+ const loginForm = {
+ username: username,
+ password: RSAencrypt(password)
+ }
+ store.dispatch('Login', loginForm).then(() => {
+ setUser(username)
+ next({ ...to, replace: true }) // 登录成功继续
+ }).catch(() => {
+ next('/401') // 否则全部重定向到401没有权限页面
+ })
} else {
- // 当进入非登陆页时
- if (store.getters.roleList && store.getters.roleList.length === 0) { // 判断当前用户是否已拉取完user_info信息
- try {
- store.dispatch('GetInfo').then(() => {
- // 如果是子系统，参数为setting文件中的sysCode属性
- if (isSubSystem) {
- store.dispatch('GetMenus', { code: sysCode }).then((accessRoute) => {
- router.addRoutes(accessRoute)
- next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+ // 如果cookie中已有token，直接进行下一步
+ if (oldToken) {
+ // 登录后进入登录页
+ if (to.path === '/login') {
+ next({ path: '/' })
+ NProgress.done() // if current page is dashboard will not trigger afterEach hook, so manually handle it
+ } else {
+ // 当进入非登陆页时
+ if (store.getters.roleList && store.getters.roleList.length === 0) { // 判断当前用户是否已拉取完user_info信息
+ try {
+ store.dispatch('GetInfo').then(() => {
+ // 如果是子系统，参数为setting文件中的sysCode属性
+ if (isSubSystem) {
+ store.dispatch('GetMenus', { code: sysCode }).then((accessRoute) => {
+ router.addRoutes(accessRoute)
+ next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+ })
+ } else { // 否则直接获取全部菜单权限
+ store.dispatch('GetMenus').then((accessRoute) => {
+ router.addRoutes(accessRoute)
+ next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+ })
+ }
})
- } else { // 否则直接获取全部菜单权限
- store.dispatch('GetMenus').then((accessRoute) => {
- router.addRoutes(accessRoute)
- next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+ } catch (err) {
+ store.dispatch('FedLogOut').then(() => {
+ // Message.error(err || '权限验证失败，请重新登录系统')
+ next({ path: '/' })
})
}
- })
- } catch (err) {
- store.dispatch('FedLogOut').then(() => {
- // Message.error(err || '权限验证失败，请重新登录系统')
- next({ path: '/' })
- })
+ } else { // 角色不为空
+ next()
+ }
}
- } else { // 角色不为空
- next()
- }
- }
- } else {
- // has no token
- // 免登录白名单，直接进入
- if (whiteList.indexOf(to.path) !== -1) {
- next()
- } else {
- // 如果允许通过链接上的token登录
- // 获取链接里的token
- const token = to.query.token
- console.log('form other system token:' + to.query.token)
- if (loginByToken && token) {
- // 调用自动登录接口，否则跳转到登录页
- store.dispatch('TokenLogin', token).then(() => {
- console.log('自动登录成功')
- console.log(to.path)
- next({ ...to, replace: true }) // 登录成功继续
- }).catch(() => {
- next('/401') // 否则全部重定向到401没有权限页面
- })
} else {
- // 判断是独立运行的子系统还是和其他基础子系统一起的
- const config = Vue.prototype.baseConfig
- if (config.singleSys) {
- next(`/login`) // 重定向到本系统登录页
- } else { // 跳转到配置的主页
- window.location.href = config.mainPage
+ // has no token
+ // 免登录白名单，直接进入
+ if (whiteList.indexOf(to.path) !== -1) {
+ next()
+ } else {
+ // 如果允许通过链接上的token登录
+ // 获取链接里的token
+ const token = to.query.token
+ console.log('form other system token:' + to.query.token)
+ if (loginByToken && token) {
+ // 调用自动登录接口，否则跳转到登录页
+ store.dispatch('TokenLogin', token).then(() => {
+ console.log('自动登录成功')
+ console.log(to.path)
+ next({ ...to, replace: true }) // 登录成功继续
+ }).catch(() => {
+ next('/401') // 否则全部重定向到401没有权限页面
+ })
+ } else {
+ // 判断是独立运行的子系统还是和其他基础子系统一起的
+ const config = Vue.prototype.baseConfig
+ if (config.singleSys) {
+ next(`/login`) // 重定向到本系统登录页
+ } else { // 跳转到配置的主页
+ window.location.href = config.mainPage
+ }
+ }
+ NProgress.done()
}
}
- NProgress.done()
}
}
})
diff --git a/src/router/index.js b/src/router/index.js
index 4935f4a..e247d73 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -42,8 +42,12 @@
},
// 登录页面
{ path: '/login', component: () => import('@/views/login/index_2'), hidden: true },
- // 3d地图
+ // 3d地图-赣州
{ path: '/3doverview', component: () => import('@/views/overview/overview3d'), hidden: true },
+ // 章丘地图页
+ { path: '/3doverviewzq', component: () => import('@/views/overview/overview3dzq'), hidden: true },
+ // 章丘首页
+ { path: '/zqindex', component: () => import('@/views/zhangqiu/zqindex'), hidden: true },
// 404错误页面
{ path: '/404', component: () => import('@/views/errorPage/404'), hidden: true },
// 401 错误页面
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index c33329b..eccd5c6 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -13,10 +13,10 @@
},
children: [
{
- path: '/tenantConfig',
- name: 'TenantConfig',
- component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
- meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
+ path: '/responsibleUser',
+ name: 'ResponsibleUser',
+ component: () => import('@/views/systemConfig/responsibleUser/listResponsibleUser'),
+ meta: { title: '联系人配置', icon: 'function', permission: ['/responsibleUser'] }
},
{
path: '/alarmConfig',
@@ -31,28 +31,16 @@
meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
},
{
- path: '/responsibleUser',
- name: 'ResponsibleUser',
- component: () => import('@/views/systemConfig/responsibleUser/listResponsibleUser'),
- meta: { title: '联系人配置', icon: 'function', permission: ['/responsibleUser'] }
- },
- {
- path: '/alarmLevel',
- name: 'AlarmLevel',
- component: () => import('@/views/systemConfig/alarmLevel/listLevel'),
- meta: { title: '告警等级配置', icon: 'function', permission: ['/alarmLevel'] }
- },
- {
- path: '/alarmContent',
- name: 'AlarmContent',
- component: () => import('@/views/systemConfig/alarmContent/listContent'),
- meta: { title: '告警内容配置', icon: 'function', permission: ['/alarmContent'] }
- },
- {
path: '/deptPermission',
name: 'DeptPermission',
component: () => import('@/views/systemConfig/deptPermission/deptPermission'),
meta: { title: '组织权限配置', icon: 'function', permission: ['/deptPermission/list'] }
+ },
+ {
+ path: '/tenantConfig',
+ name: 'TenantConfig',
+ component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
+ meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
}
]
}]
diff --git a/src/settings.js b/src/settings.js
index 58b4117..e639076 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -40,7 +40,12 @@
* @type {Boolean}
* @description 是否允许token登录
*/
- loginByToken: false,
+ loginByToken: true,
+ /**
+ * @type {Boolean}
+ * @description 是否允许用户名+密码登录
+ */
+ loginByUsername: true,
/**
* @type {Boolean},
* @description 是否是某个子系统
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 65691f6..28fee48 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -1,6 +1,7 @@
import Cookies from 'js-cookie'
const TokenKey = 'token' // token：cookie中
+const UserKey = 'user' // token：cookie中
const PublicKey = 'public_key' // 公钥：localStorage中
const CurrentSystem = 'current_system' // 当前系统，未必每个项目都有用：localStorage中
const WsUrl = 'ws_url'
@@ -17,6 +18,18 @@
return Cookies.remove(TokenKey)
}
+export function getUser() {
+ return Cookies.get(UserKey)
+}
+
+export function setUser(user) {
+ return Cookies.set(UserKey, user)
+}
+
+export function removeUser() {
+ return Cookies.remove(UserKey)
+}
+
export function getPublicKey() {
return window.localStorage.getItem(PublicKey)
}
diff --git a/src/views/dataManage/deviceData/listGasdectorData.vue b/src/views/dataManage/deviceData/listGasdectorData.vue
index b4ecd07..f16815e 100644
--- a/src/views/dataManage/deviceData/listGasdectorData.vue
+++ b/src/views/dataManage/deviceData/listGasdectorData.vue
@@ -86,8 +86,8 @@
{ text: '设备编号', value: 'devcode', align: 'center' },
{ text: '点位编号', value: 'wellCode', align: 'center' },
{ text: '设备类型', value: 'deviceTypeName', align: 'center' },
- { text: '可燃气体浓度(%LEL)', value: 'strength', align: 'center', filter: true },
- { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
+ { text: '可燃气体浓度(%LEL)', value: 'gasSampleValue', align: 'center', filter: true },
+ { text: '电量(%)', value: 'batteryValue', width: 80, align: 'center', checkCell: true },
// {text: '状态描述',value: 'descn', align: 'center'},
{ text: '权属单位', value: 'deptName', align: 'center' },
{ text: '上传时间', value: 'uptime', width: 170, align: 'center' }
diff --git a/src/views/dataManage/deviceData/listH2SData.vue b/src/views/dataManage/deviceData/listH2SData.vue
index 1dbe14d..9eb7af5 100644
--- a/src/views/dataManage/deviceData/listH2SData.vue
+++ b/src/views/dataManage/deviceData/listH2SData.vue
@@ -71,8 +71,6 @@
data() {
return {
listQuery: {
- devcode: '', // 设备编号
- wellCode: '', // 点位编号
beginTime: '', // 开始时间
endTime: '', // 结束时间
keywords: '', // 关键字
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index e0e6ab8..b56fb95 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -166,7 +166,7 @@
this.handleDateTime()
getTubeData(this.listQuery).then(response => {
this.list = response.data.rows
- this.total = parseInt(response.data.total)
+ this.total = response.data.total
this.listLoading = false
})
},
diff --git a/src/views/deviceManage/components/listDigData.vue b/src/views/deviceManage/components/listDigData.vue
index 1467b49..87e2b94 100644
--- a/src/views/deviceManage/components/listDigData.vue
+++ b/src/views/deviceManage/components/listDigData.vue
@@ -69,7 +69,7 @@
headConfig: {
show: false
}, // 表格头配置
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listGasData.vue b/src/views/deviceManage/components/listGasData.vue
index 0cdbb7d..372ef0e 100644
--- a/src/views/deviceManage/components/listGasData.vue
+++ b/src/views/deviceManage/components/listGasData.vue
@@ -69,7 +69,7 @@
{ text: '上报时间', value: 'uptime', align: 'center' },
{ text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
], // 显示列
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listGasDetectorData.vue b/src/views/deviceManage/components/listGasDetectorData.vue
new file mode 100644
index 0000000..2f282a1
--- /dev/null
+++ b/src/views/deviceManage/components/listGasDetectorData.vue
@@ -0,0 +1,155 @@
+
+
+
+
+ 设备数据情况
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/deviceManage/components/listHydrantData.vue b/src/views/deviceManage/components/listHydrantData.vue
index 8ba6cee..823201e 100644
--- a/src/views/deviceManage/components/listHydrantData.vue
+++ b/src/views/deviceManage/components/listHydrantData.vue
@@ -63,13 +63,13 @@
needIndex: false
}, // 是否需要序号列
columns: [
- { text: '上报时间', value: 'logTime', align: 'center' },
+ { text: '上报时间', value: 'logtime', align: 'center' },
{ text: '消防栓状态', value: 'descn', align: 'center' }
], // 显示列
headConfig: {
show: false
}, // 表格头配置
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listLiquidData.vue b/src/views/deviceManage/components/listLiquidData.vue
index 3b77db0..3bae830 100644
--- a/src/views/deviceManage/components/listLiquidData.vue
+++ b/src/views/deviceManage/components/listLiquidData.vue
@@ -69,7 +69,7 @@
{ text: '上报时间', value: 'uptime', align: 'center' },
{ text: '液位值', value: 'liquiddata', align: 'center' }
], // 显示列
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listNoiseData.vue b/src/views/deviceManage/components/listNoiseData.vue
index 1fb0f32..bc1024d 100644
--- a/src/views/deviceManage/components/listNoiseData.vue
+++ b/src/views/deviceManage/components/listNoiseData.vue
@@ -69,7 +69,7 @@
{ text: '上报时间', value: 'uptime', align: 'center' },
{ text: '噪声值', value: 'ddata', align: 'center' }
], // 显示列
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listTempData.vue b/src/views/deviceManage/components/listTempData.vue
index bf8136e..d2e6272 100644
--- a/src/views/deviceManage/components/listTempData.vue
+++ b/src/views/deviceManage/components/listTempData.vue
@@ -22,7 +22,15 @@
+
+
+ 设备数据情况
+
+
+
+
+
+
+
+
+
+ 温度
+
+
+ 湿度
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/deviceManage/components/listTubeData.vue b/src/views/deviceManage/components/listTubeData.vue
index 0bdd2bb..9cd3930 100644
--- a/src/views/deviceManage/components/listTubeData.vue
+++ b/src/views/deviceManage/components/listTubeData.vue
@@ -69,7 +69,7 @@
{ text: '上报时间', value: 'uptime', align: 'center' },
{ text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
], // 显示列
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listWellLocaData.vue b/src/views/deviceManage/components/listWellLocaData.vue
index 12aa64d..f1dc9de 100644
--- a/src/views/deviceManage/components/listWellLocaData.vue
+++ b/src/views/deviceManage/components/listWellLocaData.vue
@@ -70,7 +70,7 @@
headConfig: {
show: false
}, // 表格头配置
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/package.json b/package.json
index 08fc1f3..4b4e458 100644
--- a/package.json
+++ b/package.json
@@ -11,6 +11,7 @@
},
"dependencies": {
"@amap/amap-jsapi-loader": "^1.0.1",
+ "@jiaminghi/data-view": "^2.10.0",
"@riophae/vue-treeselect": "^0.4.0",
"animate.css": "^4.1.1",
"axios": "^0.21.1",
@@ -29,6 +30,7 @@
"nprogress": "^0.2.0",
"uppercamelcase": "^3.0.0",
"v-charts": "^1.19.0",
+ "v-viewer": "^1.6.4",
"vue": "^2.6.11",
"vue-amap": "^0.5.10",
"vue-router": "^3.2.0",
diff --git a/src/api/data/data.js b/src/api/data/data.js
index d87e74a..c437d7b 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -97,7 +97,7 @@
// 管盯数据查询
export function getTubeData(params) {
return request({
- url: 'tubedata/list',
+ url: 'tubedata/list-page',
method: 'get',
params
})
diff --git a/src/main.js b/src/main.js
index cb309a1..1ceea3c 100644
--- a/src/main.js
+++ b/src/main.js
@@ -38,6 +38,11 @@
// 引入v-charts
import VCharts from 'v-charts'
Vue.use(VCharts)
+
+// 引入datav
+import dataV from '@jiaminghi/data-view'
+Vue.use(dataV)
+
// 引入音频文件
import audio from '@/assets/audio/alarm.mp3'
diff --git a/src/permission.js b/src/permission.js
index 96e5f73..ea80a31 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -3,9 +3,10 @@
import NProgress from 'nprogress' // progress bar 进度条
import 'nprogress/nprogress.css' // progress bar style 进度条样式
// import { Message } from 'element-ui'
-import { getToken } from '@/utils/auth' // getToken from cookie
-import { loginByToken, isSubSystem, sysCode } from './settings'
+import { getToken, getUser, setUser } from '@/utils/auth' // getToken from cookie
+import { loginByToken, isSubSystem, sysCode, loginByUsername } from './settings'
import Vue from 'vue'
+import { RSAencrypt } from '@/utils/security'
NProgress.configure({ showSpinner: false })// NProgress configuration
@@ -27,70 +28,89 @@
}).catch(() => {
next('/401') // 否则全部重定向到401没有权限页面
})
- }
- // 如果cookie中已有token，直接进行下一步
- if (oldToken) {
- // 登录后进入登录页
- if (to.path === '/login') {
- next({ path: '/' })
- NProgress.done() // if current page is dashboard will not trigger afterEach hook, so manually handle it
+ } else {
+ // 如果链接中有用户名和密码
+ const oldUser = getUser()
+ const username = to.query.username
+ const password = to.query.pwd
+ debugger
+ if (loginByUsername && username && password && !oldUser) { // 登陆后跳转
+ const loginForm = {
+ username: username,
+ password: RSAencrypt(password)
+ }
+ store.dispatch('Login', loginForm).then(() => {
+ setUser(username)
+ next({ ...to, replace: true }) // 登录成功继续
+ }).catch(() => {
+ next('/401') // 否则全部重定向到401没有权限页面
+ })
} else {
- // 当进入非登陆页时
- if (store.getters.roleList && store.getters.roleList.length === 0) { // 判断当前用户是否已拉取完user_info信息
- try {
- store.dispatch('GetInfo').then(() => {
- // 如果是子系统，参数为setting文件中的sysCode属性
- if (isSubSystem) {
- store.dispatch('GetMenus', { code: sysCode }).then((accessRoute) => {
- router.addRoutes(accessRoute)
- next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+ // 如果cookie中已有token，直接进行下一步
+ if (oldToken) {
+ // 登录后进入登录页
+ if (to.path === '/login') {
+ next({ path: '/' })
+ NProgress.done() // if current page is dashboard will not trigger afterEach hook, so manually handle it
+ } else {
+ // 当进入非登陆页时
+ if (store.getters.roleList && store.getters.roleList.length === 0) { // 判断当前用户是否已拉取完user_info信息
+ try {
+ store.dispatch('GetInfo').then(() => {
+ // 如果是子系统，参数为setting文件中的sysCode属性
+ if (isSubSystem) {
+ store.dispatch('GetMenus', { code: sysCode }).then((accessRoute) => {
+ router.addRoutes(accessRoute)
+ next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+ })
+ } else { // 否则直接获取全部菜单权限
+ store.dispatch('GetMenus').then((accessRoute) => {
+ router.addRoutes(accessRoute)
+ next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+ })
+ }
})
- } else { // 否则直接获取全部菜单权限
- store.dispatch('GetMenus').then((accessRoute) => {
- router.addRoutes(accessRoute)
- next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+ } catch (err) {
+ store.dispatch('FedLogOut').then(() => {
+ // Message.error(err || '权限验证失败，请重新登录系统')
+ next({ path: '/' })
})
}
- })
- } catch (err) {
- store.dispatch('FedLogOut').then(() => {
- // Message.error(err || '权限验证失败，请重新登录系统')
- next({ path: '/' })
- })
+ } else { // 角色不为空
+ next()
+ }
}
- } else { // 角色不为空
- next()
- }
- }
- } else {
- // has no token
- // 免登录白名单，直接进入
- if (whiteList.indexOf(to.path) !== -1) {
- next()
- } else {
- // 如果允许通过链接上的token登录
- // 获取链接里的token
- const token = to.query.token
- console.log('form other system token:' + to.query.token)
- if (loginByToken && token) {
- // 调用自动登录接口，否则跳转到登录页
- store.dispatch('TokenLogin', token).then(() => {
- console.log('自动登录成功')
- console.log(to.path)
- next({ ...to, replace: true }) // 登录成功继续
- }).catch(() => {
- next('/401') // 否则全部重定向到401没有权限页面
- })
} else {
- // 判断是独立运行的子系统还是和其他基础子系统一起的
- const config = Vue.prototype.baseConfig
- if (config.singleSys) {
- next(`/login`) // 重定向到本系统登录页
- } else { // 跳转到配置的主页
- window.location.href = config.mainPage
+ // has no token
+ // 免登录白名单，直接进入
+ if (whiteList.indexOf(to.path) !== -1) {
+ next()
+ } else {
+ // 如果允许通过链接上的token登录
+ // 获取链接里的token
+ const token = to.query.token
+ console.log('form other system token:' + to.query.token)
+ if (loginByToken && token) {
+ // 调用自动登录接口，否则跳转到登录页
+ store.dispatch('TokenLogin', token).then(() => {
+ console.log('自动登录成功')
+ console.log(to.path)
+ next({ ...to, replace: true }) // 登录成功继续
+ }).catch(() => {
+ next('/401') // 否则全部重定向到401没有权限页面
+ })
+ } else {
+ // 判断是独立运行的子系统还是和其他基础子系统一起的
+ const config = Vue.prototype.baseConfig
+ if (config.singleSys) {
+ next(`/login`) // 重定向到本系统登录页
+ } else { // 跳转到配置的主页
+ window.location.href = config.mainPage
+ }
+ }
+ NProgress.done()
}
}
- NProgress.done()
}
}
})
diff --git a/src/router/index.js b/src/router/index.js
index 4935f4a..e247d73 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -42,8 +42,12 @@
},
// 登录页面
{ path: '/login', component: () => import('@/views/login/index_2'), hidden: true },
- // 3d地图
+ // 3d地图-赣州
{ path: '/3doverview', component: () => import('@/views/overview/overview3d'), hidden: true },
+ // 章丘地图页
+ { path: '/3doverviewzq', component: () => import('@/views/overview/overview3dzq'), hidden: true },
+ // 章丘首页
+ { path: '/zqindex', component: () => import('@/views/zhangqiu/zqindex'), hidden: true },
// 404错误页面
{ path: '/404', component: () => import('@/views/errorPage/404'), hidden: true },
// 401 错误页面
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index c33329b..eccd5c6 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -13,10 +13,10 @@
},
children: [
{
- path: '/tenantConfig',
- name: 'TenantConfig',
- component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
- meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
+ path: '/responsibleUser',
+ name: 'ResponsibleUser',
+ component: () => import('@/views/systemConfig/responsibleUser/listResponsibleUser'),
+ meta: { title: '联系人配置', icon: 'function', permission: ['/responsibleUser'] }
},
{
path: '/alarmConfig',
@@ -31,28 +31,16 @@
meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
},
{
- path: '/responsibleUser',
- name: 'ResponsibleUser',
- component: () => import('@/views/systemConfig/responsibleUser/listResponsibleUser'),
- meta: { title: '联系人配置', icon: 'function', permission: ['/responsibleUser'] }
- },
- {
- path: '/alarmLevel',
- name: 'AlarmLevel',
- component: () => import('@/views/systemConfig/alarmLevel/listLevel'),
- meta: { title: '告警等级配置', icon: 'function', permission: ['/alarmLevel'] }
- },
- {
- path: '/alarmContent',
- name: 'AlarmContent',
- component: () => import('@/views/systemConfig/alarmContent/listContent'),
- meta: { title: '告警内容配置', icon: 'function', permission: ['/alarmContent'] }
- },
- {
path: '/deptPermission',
name: 'DeptPermission',
component: () => import('@/views/systemConfig/deptPermission/deptPermission'),
meta: { title: '组织权限配置', icon: 'function', permission: ['/deptPermission/list'] }
+ },
+ {
+ path: '/tenantConfig',
+ name: 'TenantConfig',
+ component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
+ meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
}
]
}]
diff --git a/src/settings.js b/src/settings.js
index 58b4117..e639076 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -40,7 +40,12 @@
* @type {Boolean}
* @description 是否允许token登录
*/
- loginByToken: false,
+ loginByToken: true,
+ /**
+ * @type {Boolean}
+ * @description 是否允许用户名+密码登录
+ */
+ loginByUsername: true,
/**
* @type {Boolean},
* @description 是否是某个子系统
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 65691f6..28fee48 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -1,6 +1,7 @@
import Cookies from 'js-cookie'
const TokenKey = 'token' // token：cookie中
+const UserKey = 'user' // token：cookie中
const PublicKey = 'public_key' // 公钥：localStorage中
const CurrentSystem = 'current_system' // 当前系统，未必每个项目都有用：localStorage中
const WsUrl = 'ws_url'
@@ -17,6 +18,18 @@
return Cookies.remove(TokenKey)
}
+export function getUser() {
+ return Cookies.get(UserKey)
+}
+
+export function setUser(user) {
+ return Cookies.set(UserKey, user)
+}
+
+export function removeUser() {
+ return Cookies.remove(UserKey)
+}
+
export function getPublicKey() {
return window.localStorage.getItem(PublicKey)
}
diff --git a/src/views/dataManage/deviceData/listGasdectorData.vue b/src/views/dataManage/deviceData/listGasdectorData.vue
index b4ecd07..f16815e 100644
--- a/src/views/dataManage/deviceData/listGasdectorData.vue
+++ b/src/views/dataManage/deviceData/listGasdectorData.vue
@@ -86,8 +86,8 @@
{ text: '设备编号', value: 'devcode', align: 'center' },
{ text: '点位编号', value: 'wellCode', align: 'center' },
{ text: '设备类型', value: 'deviceTypeName', align: 'center' },
- { text: '可燃气体浓度(%LEL)', value: 'strength', align: 'center', filter: true },
- { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
+ { text: '可燃气体浓度(%LEL)', value: 'gasSampleValue', align: 'center', filter: true },
+ { text: '电量(%)', value: 'batteryValue', width: 80, align: 'center', checkCell: true },
// {text: '状态描述',value: 'descn', align: 'center'},
{ text: '权属单位', value: 'deptName', align: 'center' },
{ text: '上传时间', value: 'uptime', width: 170, align: 'center' }
diff --git a/src/views/dataManage/deviceData/listH2SData.vue b/src/views/dataManage/deviceData/listH2SData.vue
index 1dbe14d..9eb7af5 100644
--- a/src/views/dataManage/deviceData/listH2SData.vue
+++ b/src/views/dataManage/deviceData/listH2SData.vue
@@ -71,8 +71,6 @@
data() {
return {
listQuery: {
- devcode: '', // 设备编号
- wellCode: '', // 点位编号
beginTime: '', // 开始时间
endTime: '', // 结束时间
keywords: '', // 关键字
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index e0e6ab8..b56fb95 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -166,7 +166,7 @@
this.handleDateTime()
getTubeData(this.listQuery).then(response => {
this.list = response.data.rows
- this.total = parseInt(response.data.total)
+ this.total = response.data.total
this.listLoading = false
})
},
diff --git a/src/views/deviceManage/components/listDigData.vue b/src/views/deviceManage/components/listDigData.vue
index 1467b49..87e2b94 100644
--- a/src/views/deviceManage/components/listDigData.vue
+++ b/src/views/deviceManage/components/listDigData.vue
@@ -69,7 +69,7 @@
headConfig: {
show: false
}, // 表格头配置
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listGasData.vue b/src/views/deviceManage/components/listGasData.vue
index 0cdbb7d..372ef0e 100644
--- a/src/views/deviceManage/components/listGasData.vue
+++ b/src/views/deviceManage/components/listGasData.vue
@@ -69,7 +69,7 @@
{ text: '上报时间', value: 'uptime', align: 'center' },
{ text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
], // 显示列
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listGasDetectorData.vue b/src/views/deviceManage/components/listGasDetectorData.vue
new file mode 100644
index 0000000..2f282a1
--- /dev/null
+++ b/src/views/deviceManage/components/listGasDetectorData.vue
@@ -0,0 +1,155 @@
+
+
+
+
+ 设备数据情况
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/deviceManage/components/listHydrantData.vue b/src/views/deviceManage/components/listHydrantData.vue
index 8ba6cee..823201e 100644
--- a/src/views/deviceManage/components/listHydrantData.vue
+++ b/src/views/deviceManage/components/listHydrantData.vue
@@ -63,13 +63,13 @@
needIndex: false
}, // 是否需要序号列
columns: [
- { text: '上报时间', value: 'logTime', align: 'center' },
+ { text: '上报时间', value: 'logtime', align: 'center' },
{ text: '消防栓状态', value: 'descn', align: 'center' }
], // 显示列
headConfig: {
show: false
}, // 表格头配置
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listLiquidData.vue b/src/views/deviceManage/components/listLiquidData.vue
index 3b77db0..3bae830 100644
--- a/src/views/deviceManage/components/listLiquidData.vue
+++ b/src/views/deviceManage/components/listLiquidData.vue
@@ -69,7 +69,7 @@
{ text: '上报时间', value: 'uptime', align: 'center' },
{ text: '液位值', value: 'liquiddata', align: 'center' }
], // 显示列
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listNoiseData.vue b/src/views/deviceManage/components/listNoiseData.vue
index 1fb0f32..bc1024d 100644
--- a/src/views/deviceManage/components/listNoiseData.vue
+++ b/src/views/deviceManage/components/listNoiseData.vue
@@ -69,7 +69,7 @@
{ text: '上报时间', value: 'uptime', align: 'center' },
{ text: '噪声值', value: 'ddata', align: 'center' }
], // 显示列
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listTempData.vue b/src/views/deviceManage/components/listTempData.vue
index bf8136e..d2e6272 100644
--- a/src/views/deviceManage/components/listTempData.vue
+++ b/src/views/deviceManage/components/listTempData.vue
@@ -22,7 +22,15 @@
+
+
+ 设备数据情况
+
+
+
+
+
+
+
+
+
+ 温度
+
+
+ 湿度
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/deviceManage/components/listTubeData.vue b/src/views/deviceManage/components/listTubeData.vue
index 0bdd2bb..9cd3930 100644
--- a/src/views/deviceManage/components/listTubeData.vue
+++ b/src/views/deviceManage/components/listTubeData.vue
@@ -69,7 +69,7 @@
{ text: '上报时间', value: 'uptime', align: 'center' },
{ text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
], // 显示列
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listWellLocaData.vue b/src/views/deviceManage/components/listWellLocaData.vue
index 12aa64d..f1dc9de 100644
--- a/src/views/deviceManage/components/listWellLocaData.vue
+++ b/src/views/deviceManage/components/listWellLocaData.vue
@@ -70,7 +70,7 @@
headConfig: {
show: false
}, // 表格头配置
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listWellcoverData.vue b/src/views/deviceManage/components/listWellcoverData.vue
index a1d5ebc..5e3d69b 100644
--- a/src/views/deviceManage/components/listWellcoverData.vue
+++ b/src/views/deviceManage/components/listWellcoverData.vue
@@ -69,7 +69,7 @@
headConfig: {
show: false
}, // 表格头配置
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/package.json b/package.json
index 08fc1f3..4b4e458 100644
--- a/package.json
+++ b/package.json
@@ -11,6 +11,7 @@
},
"dependencies": {
"@amap/amap-jsapi-loader": "^1.0.1",
+ "@jiaminghi/data-view": "^2.10.0",
"@riophae/vue-treeselect": "^0.4.0",
"animate.css": "^4.1.1",
"axios": "^0.21.1",
@@ -29,6 +30,7 @@
"nprogress": "^0.2.0",
"uppercamelcase": "^3.0.0",
"v-charts": "^1.19.0",
+ "v-viewer": "^1.6.4",
"vue": "^2.6.11",
"vue-amap": "^0.5.10",
"vue-router": "^3.2.0",
diff --git a/src/api/data/data.js b/src/api/data/data.js
index d87e74a..c437d7b 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -97,7 +97,7 @@
// 管盯数据查询
export function getTubeData(params) {
return request({
- url: 'tubedata/list',
+ url: 'tubedata/list-page',
method: 'get',
params
})
diff --git a/src/main.js b/src/main.js
index cb309a1..1ceea3c 100644
--- a/src/main.js
+++ b/src/main.js
@@ -38,6 +38,11 @@
// 引入v-charts
import VCharts from 'v-charts'
Vue.use(VCharts)
+
+// 引入datav
+import dataV from '@jiaminghi/data-view'
+Vue.use(dataV)
+
// 引入音频文件
import audio from '@/assets/audio/alarm.mp3'
diff --git a/src/permission.js b/src/permission.js
index 96e5f73..ea80a31 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -3,9 +3,10 @@
import NProgress from 'nprogress' // progress bar 进度条
import 'nprogress/nprogress.css' // progress bar style 进度条样式
// import { Message } from 'element-ui'
-import { getToken } from '@/utils/auth' // getToken from cookie
-import { loginByToken, isSubSystem, sysCode } from './settings'
+import { getToken, getUser, setUser } from '@/utils/auth' // getToken from cookie
+import { loginByToken, isSubSystem, sysCode, loginByUsername } from './settings'
import Vue from 'vue'
+import { RSAencrypt } from '@/utils/security'
NProgress.configure({ showSpinner: false })// NProgress configuration
@@ -27,70 +28,89 @@
}).catch(() => {
next('/401') // 否则全部重定向到401没有权限页面
})
- }
- // 如果cookie中已有token，直接进行下一步
- if (oldToken) {
- // 登录后进入登录页
- if (to.path === '/login') {
- next({ path: '/' })
- NProgress.done() // if current page is dashboard will not trigger afterEach hook, so manually handle it
+ } else {
+ // 如果链接中有用户名和密码
+ const oldUser = getUser()
+ const username = to.query.username
+ const password = to.query.pwd
+ debugger
+ if (loginByUsername && username && password && !oldUser) { // 登陆后跳转
+ const loginForm = {
+ username: username,
+ password: RSAencrypt(password)
+ }
+ store.dispatch('Login', loginForm).then(() => {
+ setUser(username)
+ next({ ...to, replace: true }) // 登录成功继续
+ }).catch(() => {
+ next('/401') // 否则全部重定向到401没有权限页面
+ })
} else {
- // 当进入非登陆页时
- if (store.getters.roleList && store.getters.roleList.length === 0) { // 判断当前用户是否已拉取完user_info信息
- try {
- store.dispatch('GetInfo').then(() => {
- // 如果是子系统，参数为setting文件中的sysCode属性
- if (isSubSystem) {
- store.dispatch('GetMenus', { code: sysCode }).then((accessRoute) => {
- router.addRoutes(accessRoute)
- next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+ // 如果cookie中已有token，直接进行下一步
+ if (oldToken) {
+ // 登录后进入登录页
+ if (to.path === '/login') {
+ next({ path: '/' })
+ NProgress.done() // if current page is dashboard will not trigger afterEach hook, so manually handle it
+ } else {
+ // 当进入非登陆页时
+ if (store.getters.roleList && store.getters.roleList.length === 0) { // 判断当前用户是否已拉取完user_info信息
+ try {
+ store.dispatch('GetInfo').then(() => {
+ // 如果是子系统，参数为setting文件中的sysCode属性
+ if (isSubSystem) {
+ store.dispatch('GetMenus', { code: sysCode }).then((accessRoute) => {
+ router.addRoutes(accessRoute)
+ next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+ })
+ } else { // 否则直接获取全部菜单权限
+ store.dispatch('GetMenus').then((accessRoute) => {
+ router.addRoutes(accessRoute)
+ next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+ })
+ }
})
- } else { // 否则直接获取全部菜单权限
- store.dispatch('GetMenus').then((accessRoute) => {
- router.addRoutes(accessRoute)
- next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+ } catch (err) {
+ store.dispatch('FedLogOut').then(() => {
+ // Message.error(err || '权限验证失败，请重新登录系统')
+ next({ path: '/' })
})
}
- })
- } catch (err) {
- store.dispatch('FedLogOut').then(() => {
- // Message.error(err || '权限验证失败，请重新登录系统')
- next({ path: '/' })
- })
+ } else { // 角色不为空
+ next()
+ }
}
- } else { // 角色不为空
- next()
- }
- }
- } else {
- // has no token
- // 免登录白名单，直接进入
- if (whiteList.indexOf(to.path) !== -1) {
- next()
- } else {
- // 如果允许通过链接上的token登录
- // 获取链接里的token
- const token = to.query.token
- console.log('form other system token:' + to.query.token)
- if (loginByToken && token) {
- // 调用自动登录接口，否则跳转到登录页
- store.dispatch('TokenLogin', token).then(() => {
- console.log('自动登录成功')
- console.log(to.path)
- next({ ...to, replace: true }) // 登录成功继续
- }).catch(() => {
- next('/401') // 否则全部重定向到401没有权限页面
- })
} else {
- // 判断是独立运行的子系统还是和其他基础子系统一起的
- const config = Vue.prototype.baseConfig
- if (config.singleSys) {
- next(`/login`) // 重定向到本系统登录页
- } else { // 跳转到配置的主页
- window.location.href = config.mainPage
+ // has no token
+ // 免登录白名单，直接进入
+ if (whiteList.indexOf(to.path) !== -1) {
+ next()
+ } else {
+ // 如果允许通过链接上的token登录
+ // 获取链接里的token
+ const token = to.query.token
+ console.log('form other system token:' + to.query.token)
+ if (loginByToken && token) {
+ // 调用自动登录接口，否则跳转到登录页
+ store.dispatch('TokenLogin', token).then(() => {
+ console.log('自动登录成功')
+ console.log(to.path)
+ next({ ...to, replace: true }) // 登录成功继续
+ }).catch(() => {
+ next('/401') // 否则全部重定向到401没有权限页面
+ })
+ } else {
+ // 判断是独立运行的子系统还是和其他基础子系统一起的
+ const config = Vue.prototype.baseConfig
+ if (config.singleSys) {
+ next(`/login`) // 重定向到本系统登录页
+ } else { // 跳转到配置的主页
+ window.location.href = config.mainPage
+ }
+ }
+ NProgress.done()
}
}
- NProgress.done()
}
}
})
diff --git a/src/router/index.js b/src/router/index.js
index 4935f4a..e247d73 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -42,8 +42,12 @@
},
// 登录页面
{ path: '/login', component: () => import('@/views/login/index_2'), hidden: true },
- // 3d地图
+ // 3d地图-赣州
{ path: '/3doverview', component: () => import('@/views/overview/overview3d'), hidden: true },
+ // 章丘地图页
+ { path: '/3doverviewzq', component: () => import('@/views/overview/overview3dzq'), hidden: true },
+ // 章丘首页
+ { path: '/zqindex', component: () => import('@/views/zhangqiu/zqindex'), hidden: true },
// 404错误页面
{ path: '/404', component: () => import('@/views/errorPage/404'), hidden: true },
// 401 错误页面
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index c33329b..eccd5c6 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -13,10 +13,10 @@
},
children: [
{
- path: '/tenantConfig',
- name: 'TenantConfig',
- component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
- meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
+ path: '/responsibleUser',
+ name: 'ResponsibleUser',
+ component: () => import('@/views/systemConfig/responsibleUser/listResponsibleUser'),
+ meta: { title: '联系人配置', icon: 'function', permission: ['/responsibleUser'] }
},
{
path: '/alarmConfig',
@@ -31,28 +31,16 @@
meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
},
{
- path: '/responsibleUser',
- name: 'ResponsibleUser',
- component: () => import('@/views/systemConfig/responsibleUser/listResponsibleUser'),
- meta: { title: '联系人配置', icon: 'function', permission: ['/responsibleUser'] }
- },
- {
- path: '/alarmLevel',
- name: 'AlarmLevel',
- component: () => import('@/views/systemConfig/alarmLevel/listLevel'),
- meta: { title: '告警等级配置', icon: 'function', permission: ['/alarmLevel'] }
- },
- {
- path: '/alarmContent',
- name: 'AlarmContent',
- component: () => import('@/views/systemConfig/alarmContent/listContent'),
- meta: { title: '告警内容配置', icon: 'function', permission: ['/alarmContent'] }
- },
- {
path: '/deptPermission',
name: 'DeptPermission',
component: () => import('@/views/systemConfig/deptPermission/deptPermission'),
meta: { title: '组织权限配置', icon: 'function', permission: ['/deptPermission/list'] }
+ },
+ {
+ path: '/tenantConfig',
+ name: 'TenantConfig',
+ component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
+ meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
}
]
}]
diff --git a/src/settings.js b/src/settings.js
index 58b4117..e639076 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -40,7 +40,12 @@
* @type {Boolean}
* @description 是否允许token登录
*/
- loginByToken: false,
+ loginByToken: true,
+ /**
+ * @type {Boolean}
+ * @description 是否允许用户名+密码登录
+ */
+ loginByUsername: true,
/**
* @type {Boolean},
* @description 是否是某个子系统
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 65691f6..28fee48 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -1,6 +1,7 @@
import Cookies from 'js-cookie'
const TokenKey = 'token' // token：cookie中
+const UserKey = 'user' // token：cookie中
const PublicKey = 'public_key' // 公钥：localStorage中
const CurrentSystem = 'current_system' // 当前系统，未必每个项目都有用：localStorage中
const WsUrl = 'ws_url'
@@ -17,6 +18,18 @@
return Cookies.remove(TokenKey)
}
+export function getUser() {
+ return Cookies.get(UserKey)
+}
+
+export function setUser(user) {
+ return Cookies.set(UserKey, user)
+}
+
+export function removeUser() {
+ return Cookies.remove(UserKey)
+}
+
export function getPublicKey() {
return window.localStorage.getItem(PublicKey)
}
diff --git a/src/views/dataManage/deviceData/listGasdectorData.vue b/src/views/dataManage/deviceData/listGasdectorData.vue
index b4ecd07..f16815e 100644
--- a/src/views/dataManage/deviceData/listGasdectorData.vue
+++ b/src/views/dataManage/deviceData/listGasdectorData.vue
@@ -86,8 +86,8 @@
{ text: '设备编号', value: 'devcode', align: 'center' },
{ text: '点位编号', value: 'wellCode', align: 'center' },
{ text: '设备类型', value: 'deviceTypeName', align: 'center' },
- { text: '可燃气体浓度(%LEL)', value: 'strength', align: 'center', filter: true },
- { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
+ { text: '可燃气体浓度(%LEL)', value: 'gasSampleValue', align: 'center', filter: true },
+ { text: '电量(%)', value: 'batteryValue', width: 80, align: 'center', checkCell: true },
// {text: '状态描述',value: 'descn', align: 'center'},
{ text: '权属单位', value: 'deptName', align: 'center' },
{ text: '上传时间', value: 'uptime', width: 170, align: 'center' }
diff --git a/src/views/dataManage/deviceData/listH2SData.vue b/src/views/dataManage/deviceData/listH2SData.vue
index 1dbe14d..9eb7af5 100644
--- a/src/views/dataManage/deviceData/listH2SData.vue
+++ b/src/views/dataManage/deviceData/listH2SData.vue
@@ -71,8 +71,6 @@
data() {
return {
listQuery: {
- devcode: '', // 设备编号
- wellCode: '', // 点位编号
beginTime: '', // 开始时间
endTime: '', // 结束时间
keywords: '', // 关键字
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index e0e6ab8..b56fb95 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -166,7 +166,7 @@
this.handleDateTime()
getTubeData(this.listQuery).then(response => {
this.list = response.data.rows
- this.total = parseInt(response.data.total)
+ this.total = response.data.total
this.listLoading = false
})
},
diff --git a/src/views/deviceManage/components/listDigData.vue b/src/views/deviceManage/components/listDigData.vue
index 1467b49..87e2b94 100644
--- a/src/views/deviceManage/components/listDigData.vue
+++ b/src/views/deviceManage/components/listDigData.vue
@@ -69,7 +69,7 @@
headConfig: {
show: false
}, // 表格头配置
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listGasData.vue b/src/views/deviceManage/components/listGasData.vue
index 0cdbb7d..372ef0e 100644
--- a/src/views/deviceManage/components/listGasData.vue
+++ b/src/views/deviceManage/components/listGasData.vue
@@ -69,7 +69,7 @@
{ text: '上报时间', value: 'uptime', align: 'center' },
{ text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
], // 显示列
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listGasDetectorData.vue b/src/views/deviceManage/components/listGasDetectorData.vue
new file mode 100644
index 0000000..2f282a1
--- /dev/null
+++ b/src/views/deviceManage/components/listGasDetectorData.vue
@@ -0,0 +1,155 @@
+
+
+
+
+ 设备数据情况
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/deviceManage/components/listHydrantData.vue b/src/views/deviceManage/components/listHydrantData.vue
index 8ba6cee..823201e 100644
--- a/src/views/deviceManage/components/listHydrantData.vue
+++ b/src/views/deviceManage/components/listHydrantData.vue
@@ -63,13 +63,13 @@
needIndex: false
}, // 是否需要序号列
columns: [
- { text: '上报时间', value: 'logTime', align: 'center' },
+ { text: '上报时间', value: 'logtime', align: 'center' },
{ text: '消防栓状态', value: 'descn', align: 'center' }
], // 显示列
headConfig: {
show: false
}, // 表格头配置
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listLiquidData.vue b/src/views/deviceManage/components/listLiquidData.vue
index 3b77db0..3bae830 100644
--- a/src/views/deviceManage/components/listLiquidData.vue
+++ b/src/views/deviceManage/components/listLiquidData.vue
@@ -69,7 +69,7 @@
{ text: '上报时间', value: 'uptime', align: 'center' },
{ text: '液位值', value: 'liquiddata', align: 'center' }
], // 显示列
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listNoiseData.vue b/src/views/deviceManage/components/listNoiseData.vue
index 1fb0f32..bc1024d 100644
--- a/src/views/deviceManage/components/listNoiseData.vue
+++ b/src/views/deviceManage/components/listNoiseData.vue
@@ -69,7 +69,7 @@
{ text: '上报时间', value: 'uptime', align: 'center' },
{ text: '噪声值', value: 'ddata', align: 'center' }
], // 显示列
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listTempData.vue b/src/views/deviceManage/components/listTempData.vue
index bf8136e..d2e6272 100644
--- a/src/views/deviceManage/components/listTempData.vue
+++ b/src/views/deviceManage/components/listTempData.vue
@@ -22,7 +22,15 @@
+
+
+ 设备数据情况
+
+
+
+
+
+
+
+
+
+ 温度
+
+
+ 湿度
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/deviceManage/components/listTubeData.vue b/src/views/deviceManage/components/listTubeData.vue
index 0bdd2bb..9cd3930 100644
--- a/src/views/deviceManage/components/listTubeData.vue
+++ b/src/views/deviceManage/components/listTubeData.vue
@@ -69,7 +69,7 @@
{ text: '上报时间', value: 'uptime', align: 'center' },
{ text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
], // 显示列
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listWellLocaData.vue b/src/views/deviceManage/components/listWellLocaData.vue
index 12aa64d..f1dc9de 100644
--- a/src/views/deviceManage/components/listWellLocaData.vue
+++ b/src/views/deviceManage/components/listWellLocaData.vue
@@ -70,7 +70,7 @@
headConfig: {
show: false
}, // 表格头配置
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listWellcoverData.vue b/src/views/deviceManage/components/listWellcoverData.vue
index a1d5ebc..5e3d69b 100644
--- a/src/views/deviceManage/components/listWellcoverData.vue
+++ b/src/views/deviceManage/components/listWellcoverData.vue
@@ -69,7 +69,7 @@
headConfig: {
show: false
}, // 表格头配置
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index f67d504..d51a8ce 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -20,6 +20,10 @@
{{ deviceForm.onlineStateName }}
+
+
+
+ 设备数据情况
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/deviceManage/components/listHydrantData.vue b/src/views/deviceManage/components/listHydrantData.vue
index 8ba6cee..823201e 100644
--- a/src/views/deviceManage/components/listHydrantData.vue
+++ b/src/views/deviceManage/components/listHydrantData.vue
@@ -63,13 +63,13 @@
needIndex: false
}, // 是否需要序号列
columns: [
- { text: '上报时间', value: 'logTime', align: 'center' },
+ { text: '上报时间', value: 'logtime', align: 'center' },
{ text: '消防栓状态', value: 'descn', align: 'center' }
], // 显示列
headConfig: {
show: false
}, // 表格头配置
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listLiquidData.vue b/src/views/deviceManage/components/listLiquidData.vue
index 3b77db0..3bae830 100644
--- a/src/views/deviceManage/components/listLiquidData.vue
+++ b/src/views/deviceManage/components/listLiquidData.vue
@@ -69,7 +69,7 @@
{ text: '上报时间', value: 'uptime', align: 'center' },
{ text: '液位值', value: 'liquiddata', align: 'center' }
], // 显示列
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listNoiseData.vue b/src/views/deviceManage/components/listNoiseData.vue
index 1fb0f32..bc1024d 100644
--- a/src/views/deviceManage/components/listNoiseData.vue
+++ b/src/views/deviceManage/components/listNoiseData.vue
@@ -69,7 +69,7 @@
{ text: '上报时间', value: 'uptime', align: 'center' },
{ text: '噪声值', value: 'ddata', align: 'center' }
], // 显示列
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listTempData.vue b/src/views/deviceManage/components/listTempData.vue
index bf8136e..d2e6272 100644
--- a/src/views/deviceManage/components/listTempData.vue
+++ b/src/views/deviceManage/components/listTempData.vue
@@ -22,7 +22,15 @@
+
+
+ 设备数据情况
+
+
+
+
+
+
+
+
+
+ 温度
+
+
+ 湿度
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/deviceManage/components/listTubeData.vue b/src/views/deviceManage/components/listTubeData.vue
index 0bdd2bb..9cd3930 100644
--- a/src/views/deviceManage/components/listTubeData.vue
+++ b/src/views/deviceManage/components/listTubeData.vue
@@ -69,7 +69,7 @@
{ text: '上报时间', value: 'uptime', align: 'center' },
{ text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
], // 显示列
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listWellLocaData.vue b/src/views/deviceManage/components/listWellLocaData.vue
index 12aa64d..f1dc9de 100644
--- a/src/views/deviceManage/components/listWellLocaData.vue
+++ b/src/views/deviceManage/components/listWellLocaData.vue
@@ -70,7 +70,7 @@
headConfig: {
show: false
}, // 表格头配置
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listWellcoverData.vue b/src/views/deviceManage/components/listWellcoverData.vue
index a1d5ebc..5e3d69b 100644
--- a/src/views/deviceManage/components/listWellcoverData.vue
+++ b/src/views/deviceManage/components/listWellcoverData.vue
@@ -69,7 +69,7 @@
headConfig: {
show: false
}, // 表格头配置
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index f67d504..d51a8ce 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -20,6 +20,10 @@
{{ deviceForm.onlineStateName }}
+
+
+
+ 设备数据情况
+
+
+
+
+
+
+
+
+
+ 温度
+
+
+ 湿度
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/deviceManage/components/listTubeData.vue b/src/views/deviceManage/components/listTubeData.vue
index 0bdd2bb..9cd3930 100644
--- a/src/views/deviceManage/components/listTubeData.vue
+++ b/src/views/deviceManage/components/listTubeData.vue
@@ -69,7 +69,7 @@
{ text: '上报时间', value: 'uptime', align: 'center' },
{ text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
], // 显示列
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listWellLocaData.vue b/src/views/deviceManage/components/listWellLocaData.vue
index 12aa64d..f1dc9de 100644
--- a/src/views/deviceManage/components/listWellLocaData.vue
+++ b/src/views/deviceManage/components/listWellLocaData.vue
@@ -70,7 +70,7 @@
headConfig: {
show: false
}, // 表格头配置
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listWellcoverData.vue b/src/views/deviceManage/components/listWellcoverData.vue
index a1d5ebc..5e3d69b 100644
--- a/src/views/deviceManage/components/listWellcoverData.vue
+++ b/src/views/deviceManage/components/listWellcoverData.vue
@@ -69,7 +69,7 @@
headConfig: {
show: false
}, // 表格头配置
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index f67d504..d51a8ce 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -20,6 +20,10 @@
{{ deviceForm.onlineStateName }}
+
+
+
+ 设备数据情况
+
+
+
+
+
+
+
+
+
+ 温度
+
+
+ 湿度
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/deviceManage/components/listTubeData.vue b/src/views/deviceManage/components/listTubeData.vue
index 0bdd2bb..9cd3930 100644
--- a/src/views/deviceManage/components/listTubeData.vue
+++ b/src/views/deviceManage/components/listTubeData.vue
@@ -69,7 +69,7 @@
{ text: '上报时间', value: 'uptime', align: 'center' },
{ text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
], // 显示列
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listWellLocaData.vue b/src/views/deviceManage/components/listWellLocaData.vue
index 12aa64d..f1dc9de 100644
--- a/src/views/deviceManage/components/listWellLocaData.vue
+++ b/src/views/deviceManage/components/listWellLocaData.vue
@@ -70,7 +70,7 @@
headConfig: {
show: false
}, // 表格头配置
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listWellcoverData.vue b/src/views/deviceManage/components/listWellcoverData.vue
index a1d5ebc..5e3d69b 100644
--- a/src/views/deviceManage/components/listWellcoverData.vue
+++ b/src/views/deviceManage/components/listWellcoverData.vue
@@ -69,7 +69,7 @@
headConfig: {
show: false
}, // 表格头配置
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index f67d504..d51a8ce 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -20,6 +20,10 @@
{{ deviceForm.onlineStateName }}
+
+
+
+ 设备数据情况
+
+
+
+
+
+
+
+
+
+ 温度
+
+
+ 湿度
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/deviceManage/components/listTubeData.vue b/src/views/deviceManage/components/listTubeData.vue
index 0bdd2bb..9cd3930 100644
--- a/src/views/deviceManage/components/listTubeData.vue
+++ b/src/views/deviceManage/components/listTubeData.vue
@@ -69,7 +69,7 @@
{ text: '上报时间', value: 'uptime', align: 'center' },
{ text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
], // 显示列
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listWellLocaData.vue b/src/views/deviceManage/components/listWellLocaData.vue
index 12aa64d..f1dc9de 100644
--- a/src/views/deviceManage/components/listWellLocaData.vue
+++ b/src/views/deviceManage/components/listWellLocaData.vue
@@ -70,7 +70,7 @@
headConfig: {
show: false
}, // 表格头配置
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listWellcoverData.vue b/src/views/deviceManage/components/listWellcoverData.vue
index a1d5ebc..5e3d69b 100644
--- a/src/views/deviceManage/components/listWellcoverData.vue
+++ b/src/views/deviceManage/components/listWellcoverData.vue
@@ -69,7 +69,7 @@
headConfig: {
show: false
}, // 表格头配置
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index f67d504..d51a8ce 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -20,6 +20,10 @@
{{ deviceForm.onlineStateName }}
+
+
+
+ 设备数据情况
+
+
+
+
+
+
+
+
+
+ 温度
+
+
+ 湿度
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/deviceManage/components/listTubeData.vue b/src/views/deviceManage/components/listTubeData.vue
index 0bdd2bb..9cd3930 100644
--- a/src/views/deviceManage/components/listTubeData.vue
+++ b/src/views/deviceManage/components/listTubeData.vue
@@ -69,7 +69,7 @@
{ text: '上报时间', value: 'uptime', align: 'center' },
{ text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
], // 显示列
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listWellLocaData.vue b/src/views/deviceManage/components/listWellLocaData.vue
index 12aa64d..f1dc9de 100644
--- a/src/views/deviceManage/components/listWellLocaData.vue
+++ b/src/views/deviceManage/components/listWellLocaData.vue
@@ -70,7 +70,7 @@
headConfig: {
show: false
}, // 表格头配置
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listWellcoverData.vue b/src/views/deviceManage/components/listWellcoverData.vue
index a1d5ebc..5e3d69b 100644
--- a/src/views/deviceManage/components/listWellcoverData.vue
+++ b/src/views/deviceManage/components/listWellcoverData.vue
@@ -69,7 +69,7 @@
headConfig: {
show: false
}, // 表格头配置
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index f67d504..d51a8ce 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -20,6 +20,10 @@
{{ deviceForm.onlineStateName }}
+
+
+
+ 设备数据情况
+
+
+
+
+
+
+
+
+
+ 温度
+
+
+ 湿度
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/deviceManage/components/listTubeData.vue b/src/views/deviceManage/components/listTubeData.vue
index 0bdd2bb..9cd3930 100644
--- a/src/views/deviceManage/components/listTubeData.vue
+++ b/src/views/deviceManage/components/listTubeData.vue
@@ -69,7 +69,7 @@
{ text: '上报时间', value: 'uptime', align: 'center' },
{ text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
], // 显示列
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listWellLocaData.vue b/src/views/deviceManage/components/listWellLocaData.vue
index 12aa64d..f1dc9de 100644
--- a/src/views/deviceManage/components/listWellLocaData.vue
+++ b/src/views/deviceManage/components/listWellLocaData.vue
@@ -70,7 +70,7 @@
headConfig: {
show: false
}, // 表格头配置
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listWellcoverData.vue b/src/views/deviceManage/components/listWellcoverData.vue
index a1d5ebc..5e3d69b 100644
--- a/src/views/deviceManage/components/listWellcoverData.vue
+++ b/src/views/deviceManage/components/listWellcoverData.vue
@@ -69,7 +69,7 @@
headConfig: {
show: false
}, // 表格头配置
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index f67d504..d51a8ce 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -20,6 +20,10 @@
{{ deviceForm.onlineStateName }}
+
+
+
+ 设备数据情况
+
+
+
+
+
+
+
+
+
+ 温度
+
+
+ 湿度
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/deviceManage/components/listTubeData.vue b/src/views/deviceManage/components/listTubeData.vue
index 0bdd2bb..9cd3930 100644
--- a/src/views/deviceManage/components/listTubeData.vue
+++ b/src/views/deviceManage/components/listTubeData.vue
@@ -69,7 +69,7 @@
{ text: '上报时间', value: 'uptime', align: 'center' },
{ text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
], // 显示列
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listWellLocaData.vue b/src/views/deviceManage/components/listWellLocaData.vue
index 12aa64d..f1dc9de 100644
--- a/src/views/deviceManage/components/listWellLocaData.vue
+++ b/src/views/deviceManage/components/listWellLocaData.vue
@@ -70,7 +70,7 @@
headConfig: {
show: false
}, // 表格头配置
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listWellcoverData.vue b/src/views/deviceManage/components/listWellcoverData.vue
index a1d5ebc..5e3d69b 100644
--- a/src/views/deviceManage/components/listWellcoverData.vue
+++ b/src/views/deviceManage/components/listWellcoverData.vue
@@ -69,7 +69,7 @@
headConfig: {
show: false
}, // 表格头配置
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index f67d504..d51a8ce 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -20,6 +20,10 @@
{{ deviceForm.onlineStateName }}
+
+
+
+ 设备数据情况
+
+
+
+
+
+
+
+
+
+ 温度
+
+
+ 湿度
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/deviceManage/components/listTubeData.vue b/src/views/deviceManage/components/listTubeData.vue
index 0bdd2bb..9cd3930 100644
--- a/src/views/deviceManage/components/listTubeData.vue
+++ b/src/views/deviceManage/components/listTubeData.vue
@@ -69,7 +69,7 @@
{ text: '上报时间', value: 'uptime', align: 'center' },
{ text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
], // 显示列
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listWellLocaData.vue b/src/views/deviceManage/components/listWellLocaData.vue
index 12aa64d..f1dc9de 100644
--- a/src/views/deviceManage/components/listWellLocaData.vue
+++ b/src/views/deviceManage/components/listWellLocaData.vue
@@ -70,7 +70,7 @@
headConfig: {
show: false
}, // 表格头配置
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listWellcoverData.vue b/src/views/deviceManage/components/listWellcoverData.vue
index a1d5ebc..5e3d69b 100644
--- a/src/views/deviceManage/components/listWellcoverData.vue
+++ b/src/views/deviceManage/components/listWellcoverData.vue
@@ -69,7 +69,7 @@
headConfig: {
show: false
}, // 表格头配置
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index f67d504..d51a8ce 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -20,6 +20,10 @@
{{ deviceForm.onlineStateName }}
+
+
+
+ 设备数据情况
+
+
+
+
+
+
+
+
+
+ 温度
+
+
+ 湿度
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/deviceManage/components/listTubeData.vue b/src/views/deviceManage/components/listTubeData.vue
index 0bdd2bb..9cd3930 100644
--- a/src/views/deviceManage/components/listTubeData.vue
+++ b/src/views/deviceManage/components/listTubeData.vue
@@ -69,7 +69,7 @@
{ text: '上报时间', value: 'uptime', align: 'center' },
{ text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
], // 显示列
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listWellLocaData.vue b/src/views/deviceManage/components/listWellLocaData.vue
index 12aa64d..f1dc9de 100644
--- a/src/views/deviceManage/components/listWellLocaData.vue
+++ b/src/views/deviceManage/components/listWellLocaData.vue
@@ -70,7 +70,7 @@
headConfig: {
show: false
}, // 表格头配置
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listWellcoverData.vue b/src/views/deviceManage/components/listWellcoverData.vue
index a1d5ebc..5e3d69b 100644
--- a/src/views/deviceManage/components/listWellcoverData.vue
+++ b/src/views/deviceManage/components/listWellcoverData.vue
@@ -69,7 +69,7 @@
headConfig: {
show: false
}, // 表格头配置
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index f67d504..d51a8ce 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -20,6 +20,10 @@
{{ deviceForm.onlineStateName }}
+
+
+
+ 设备数据情况
+
+
+
+
+
+
+
+
+
+ 温度
+
+
+ 湿度
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/deviceManage/components/listTubeData.vue b/src/views/deviceManage/components/listTubeData.vue
index 0bdd2bb..9cd3930 100644
--- a/src/views/deviceManage/components/listTubeData.vue
+++ b/src/views/deviceManage/components/listTubeData.vue
@@ -69,7 +69,7 @@
{ text: '上报时间', value: 'uptime', align: 'center' },
{ text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
], // 显示列
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listWellLocaData.vue b/src/views/deviceManage/components/listWellLocaData.vue
index 12aa64d..f1dc9de 100644
--- a/src/views/deviceManage/components/listWellLocaData.vue
+++ b/src/views/deviceManage/components/listWellLocaData.vue
@@ -70,7 +70,7 @@
headConfig: {
show: false
}, // 表格头配置
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listWellcoverData.vue b/src/views/deviceManage/components/listWellcoverData.vue
index a1d5ebc..5e3d69b 100644
--- a/src/views/deviceManage/components/listWellcoverData.vue
+++ b/src/views/deviceManage/components/listWellcoverData.vue
@@ -69,7 +69,7 @@
headConfig: {
show: false
}, // 表格头配置
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index f67d504..d51a8ce 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -20,6 +20,10 @@
{{ deviceForm.onlineStateName }}
+
+
+
+ 设备数据情况
+
+
+
+
+
+
+
+
+
+ 温度
+
+
+ 湿度
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/deviceManage/components/listTubeData.vue b/src/views/deviceManage/components/listTubeData.vue
index 0bdd2bb..9cd3930 100644
--- a/src/views/deviceManage/components/listTubeData.vue
+++ b/src/views/deviceManage/components/listTubeData.vue
@@ -69,7 +69,7 @@
{ text: '上报时间', value: 'uptime', align: 'center' },
{ text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
], // 显示列
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listWellLocaData.vue b/src/views/deviceManage/components/listWellLocaData.vue
index 12aa64d..f1dc9de 100644
--- a/src/views/deviceManage/components/listWellLocaData.vue
+++ b/src/views/deviceManage/components/listWellLocaData.vue
@@ -70,7 +70,7 @@
headConfig: {
show: false
}, // 表格头配置
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listWellcoverData.vue b/src/views/deviceManage/components/listWellcoverData.vue
index a1d5ebc..5e3d69b 100644
--- a/src/views/deviceManage/components/listWellcoverData.vue
+++ b/src/views/deviceManage/components/listWellcoverData.vue
@@ -69,7 +69,7 @@
headConfig: {
show: false
}, // 表格头配置
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index f67d504..d51a8ce 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -20,6 +20,10 @@
{{ deviceForm.onlineStateName }}
+
+
+
+ 设备数据情况
+
+
+
+
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index 138af7a..94cbe3f 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.vue
@@ -138,11 +138,11 @@
value: 'devcode',
align: 'center'
},
- // {
- // text: '设备名称',
- // value: 'deviceName',
- // align: 'center'
- // },
+ {
+ text: '设备名称',
+ value: 'deviceName',
+ align: 'center'
+ },
{
text: '设备类型',
value: 'deviceTypeName',
diff --git a/src/views/overview/overview3dzq.vue b/src/views/overview/overview3dzq.vue
index 2297af0..988c5a8 100644
--- a/src/views/overview/overview3dzq.vue
+++ b/src/views/overview/overview3dzq.vue
@@ -35,7 +35,7 @@
import PopupDataFilter from '@/views/overview/components/popupDataFilter'
import PopupLocation from '@/views/overview/components/popupLocation'
import MapSearchComp from '@/views/overview/components/mapSearchComp'
-
+import { RSAencrypt } from '@/utils/security'
import axios from 'axios'
// import 'cesium/Source/Widgets/widgets.css'// 导入必须的样式表
// import 'cesium/Source/Cesium'// 导入必须的样式表
@@ -44,17 +44,17 @@
import 'mars3d/dist/mars3d.css'
import 'mars3d/dist/mars3d.js'
import * as mars3d from 'mars3d'
-import { RSAencrypt } from '@/utils/security'
let underground = null
-const layer2021 = null
+let layer2021 = null
+let layer2020 = null
let rqline_layer = null
let rqpoint_layer = null
let rqpoint3D_layer = null
let queryLineserver = null
let queryPointserver = null
export default {
- name: 'Overview3D',
+ name: 'Overview3dzq',
components: { MapSearchComp, PopupLocation, PopupDataFilter, ToolBox, AlarmList, AMapMarker, AMapContainer, DeptSelect },
data() {
return {
@@ -79,7 +79,7 @@
searchResultOffset: [-12, -30],
searchResultIcon: require('@/assets/overview/pure-position-icon.png'), // 报警图标
showAlarm: true, // 是否显示报警
- alpha: 100,
+ alpha: 80,
toolShow: false, // 工具栏是否显示
menus: {
menuList: [
@@ -116,7 +116,6 @@
tempMarker: null,
showClearBtn: false, // 是否显示清除查询按钮
bloomEffect: null,
- kaptcha: '',
loadToken: false
}
},
@@ -128,7 +127,9 @@
},
watch: {
alpha(val) {
- window.map.basemap.opacity = val / 100
+ window.viewer.imageryLayers._layers.forEach(layer => {
+ layer.alpha = val / 100 // 我们可以设置为0
+ })
underground.alpha = val / 100
if (val <= 90 && window.map.level >= 19) {
rqline_layer.show = false
@@ -166,7 +167,7 @@
},
beforeCreate: function() { // 从后台获取系统配置，根据配置判断是否加载验证码控件
this.$store.dispatch('GetConfig').then(() => {
- // this.$message.success('连接服务器成功')
+ this.$message.success('连接服务器成功')
this.handleLogin()
}).catch((e) => {
// this.$message.error('连接服务器失败')
@@ -178,7 +179,7 @@
const loginForm = {
sid: this.$store.getters.sid,
username: 'admin',
- password: RSAencrypt('111111')
+ password: RSAencrypt('1q2W3E4R')
}
this.$store.dispatch('Login', loginForm).then(() => {
// this.$message.success('登录成功')
@@ -204,6 +205,7 @@
tileMatrixLabels: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21']
})
var layer = window.viewer.imageryLayers.addImageryProvider(layerProvider)
+ layer.alpha = this.alpha / 100
// window.viewer.zoomTo(layer)
return layer
},
@@ -256,63 +258,85 @@
{ name: '注记', type: 'tdt', layer: 'ter_z', key: ['216ee92889e17ab1b083fae665d522b8'] },
{ name: '注记', type: 'tdt', layer: 'img_z', key: ['216ee92889e17ab1b083fae665d522b8'] }
]
- },
- {
- 'id': 1112,
- 'pid': 10,
- 'name': '天地图电子',
- 'icon': 'http://mars3d.cn/example/img/basemaps/tdt_vec.png',
- 'type': 'group',
- 'layers': [
- { 'name': '底图', 'type': 'tdt', 'layer': 'vec_d', 'key': ['216ee92889e17ab1b083fae665d522b8'] },
- { 'name': '注记', 'type': 'tdt', 'layer': 'vec_z', 'key': ['216ee92889e17ab1b083fae665d522b8'] }
- ]
- },
- {
- 'id': 1113,
- 'pid': 10,
- 'name': '天地图影像',
- 'icon': 'http://mars3d.cn/example/img/basemaps/tdt_img.png',
- 'type': 'tdt',
- 'layer': 'img_d',
- 'key': ['216ee92889e17ab1b083fae665d522b8'],
- 'show': true
}
+ // {
+ // 'id': 1112,
+ // 'pid': 10,
+ // 'name': '天地图电子',
+ // 'icon': 'http://mars3d.cn/example/img/basemaps/tdt_vec.png',
+ // 'type': 'group',
+ // 'layers': [
+ // { 'name': '底图', 'type': 'tdt', 'layer': 'vec_d', 'key': ['216ee92889e17ab1b083fae665d522b8'] },
+ // { 'name': '注记', 'type': 'tdt', 'layer': 'vec_z', 'key': ['216ee92889e17ab1b083fae665d522b8'] }
+ // ]
+ // },
+ // {
+ // 'id': 1113,
+ // 'pid': 10,
+ // 'name': '天地图影像',
+ // 'icon': 'http://mars3d.cn/example/img/basemaps/tdt_img.png',
+ // 'type': 'tdt',
+ // 'layer': 'img_d',
+ // 'key': ['216ee92889e17ab1b083fae665d522b8'],
+ // 'show': true
+ // }
]
}
Cesium.Ion.defaultAccessToken = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiI0N2E2M2ZmYi1iMDhjLTQwN2QtODZmOC0zNDZjNTMxYjgyNWEiLCJpZCI6MzY5MDMsImlhdCI6MTYwNzMzMTE2Nn0.5xsFCB0dxpcNGUkJOEpsVhUW9bf66XZIwV3hkZl09UI'
// 创建viewer实例
- // window.viewer = new Cesium.Viewer('mars3dContainer',
- // {
- // geocoder: false, // 是否显示地名查找控件
- // infoBox: false,
- // animation: false, // 是否显示动画控件(左下方那个)
- // timeline: false, // 是否显示时间线控件
- // shadows: false, // 阴影是否被太阳投射
- // showldAnimate: true, // 让场景中的动画自动播放
- // sceneModePicker: false, // 是否显示投影方式控件
- // fullscreenButton: false, // 全屏按钮不显示
- // homeButton: false,
- // navigationHelpButton: false, // 帮助按钮
- // baseLayerPicker: false,
- // imageryProvider: new Cesium.TileMapServiceImageryProvider({
- // url: Cesium.buildModuleUrl('Assets/Textures/NaturalEarthII')
- // })
- // })
+ window.viewer = new Cesium.Viewer('mars3dContainer', {
+ geocoder: false, // 是否显示地名查找控件
+ infoBox: false,
+ animation: false, // 是否显示动画控件(左下方那个)
+ timeline: false, // 是否显示时间线控件
+ shadows: false, // 阴影是否被太阳投射
+ showldAnimate: true, // 让场景中的动画自动播放
+ sceneModePicker: false, // 是否显示投影方式控件
+ fullscreenButton: false, // 全屏按钮不显示
+ homeButton: false,
+ navigationHelpButton: false, // 帮助按钮
+ baseLayerPicker: false,
+ imageryProvider: new Cesium.TileMapServiceImageryProvider({
+ url: Cesium.buildModuleUrl('Assets/Textures/NaturalEarthII')
+ })
+ })
// window.viewer.imageryLayers._layers[0].show = false
// window.viewer.scene.globe.baseColor = Cesium.Color.WHITE;
- // window.viewer._cesiumWidget._creditContainer.style.display = 'none' // 去除版权信息
+ window.viewer._cesiumWidget._creditContainer.style.display = 'none' // 去除版权信息
// mars3d.Map也可以直接传入外部已经构造好的viewer, 支持config.json所有参数
- const map = new mars3d.Map('mars3dContainer', mapOptions)
+ const map = new mars3d.Map(window.viewer, mapOptions)
- // const imgLayer = window.viewer.imageryLayers.addImageryProvider(layer)
+ const url2021 = 'http://172.20.90.108:8081/geoesb/proxy/5a44607b2e814658b463b76f9675bd3e/9bf164775ad94a18a5324f0eb681deea'
+ const url2020 = 'http://172.20.90.108:8081/geoesb/proxy/4fb75f7491c94356a9dd58a44d0dc57b/9bf164775ad94a18a5324f0eb681deea'
- // const map = new mars3d.Map('mars3dContainer', mapOptions)
- map.basemap = 1113
- // const url2021 = 'http://172.20.90.108:8081/geoesb/proxy/5a44607b2e814658b463b76f9675bd3e/9bf164775ad94a18a5324f0eb681deea'
- // const url2020 = 'http://172.20.90.108:8081/geoesb/proxy/4fb75f7491c94356a9dd58a44d0dc57b/9bf164775ad94a18a5324f0eb681deea'
- //
+ var layerProvider = new Cesium.WebMapTileServiceImageryProvider({
+ url: url2021 + '/Layers/default/Custom_Layers/{TileMatrix}/{TileRow}/{TileCol}.png',
+ layer: 'wzmap_map',
+ style: 'default',
+ tileMatrixSetID: 'default028mm',
+ format: 'image/png',
+ tilingScheme: new Cesium.GeographicTilingScheme(),
+ tileMatrixLabels: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21']
+ })
+ layer2021 = window.viewer.imageryLayers.addImageryProvider(layerProvider)
+ layer2021.alpha = this.alpha / 100
+
+ layerProvider = new Cesium.WebMapTileServiceImageryProvider({
+ url: url2020 + '?service=WMTS&request=GetTile&version=1.0.0&layer=JN2020DOM_05M&style=default&format=image/png&TileMatrixSet=CustomCRS4490ScaleJN2020DOM_05M&TileMatrix={TileMatrix}&TileRow={TileRow}&TileCol={TileCol}',
+ layer: 'wzmap_map',
+ style: 'default',
+ tileMatrixSetID: 'default028mm',
+ format: 'image/png',
+ tilingScheme: new Cesium.GeographicTilingScheme(),
+ tileMatrixLabels: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21']
+ })
+ layer2020 = window.viewer.imageryLayers.addImageryProvider(layerProvider)
+ layer2020.alpha = this.alpha / 100
+
+ layer2021.show = false
+
// layer2021 = this.SuperMap3DImageryProvider(url2021)
+ // layer2020 = this.SuperMap3DImageryProvider(url2020)
// map.scene.screenSpaceCameraController.enableCollisionDetection = false
// 设置鼠标
map.scene.screenSpaceCameraController.tiltEventTypes = [Cesium.CameraEventType.RIGHT_DRAG]
@@ -327,7 +351,7 @@
// enabled: true
// })
// map.addEffect(this.bloomEffect)
- window.map.basemap.opacity = this.alpha / 100
+ // window.map.basemap.opacity = this.alpha / 100
// 崩溃后刷新
map.on(mars3d.EventType.renderError, function(event) {
window.location.reload()
@@ -512,17 +536,22 @@
changeBaseMap(type) {
this.baseLayer = type
if (type === 'gaode_vec') {
- window.map.basemap = 1112
+ layer2021.show = true
+ layer2020.show = false
+ window.viewer.imageryLayers.raiseToTop(layer2021)
+ // window.map.basemap = 1112
// if (this.bloomEffect !== null) {
// this.bloomEffect.enabled = false
// }
} else {
- window.map.basemap = 1113
+ layer2021.show = false
+ layer2020.show = true
+ window.viewer.imageryLayers.raiseToTop(layer2020)
+ // window.map.basemap = 1113
// if (this.bloomEffect !== null) {
// this.bloomEffect.enabled = true
// }
}
- window.viewer.imageryLayers.raiseToTop(layer2021)
},
// 倒计时函数
countDown() {
@@ -756,7 +785,6 @@
// 获取当前报警列表
this.alarmListOri = response.data // 列表原始
this.alarmList = response.data // 要显示的报警列表
- this.alarmList = [{}, {}]
this.alarmWells = [] // 报警的井列表
for (const alarm of response.data) {
if (this.alarmWells.findIndex(item => item.wellCode === alarm.wellCode) == -1) {
@@ -951,6 +979,46 @@
margin-bottom: 0px;
}
}
+// 刷新框
+.function-div{
+ position: absolute;
+ right: 10px;
+ top: 7px;
+ z-index: 1100;
+ padding: 10px;
+ color: #ce8b74;
+ font-size: 14px;
+ /*background-color: rgba(244, 233, 230, 1.0);*/
+ .font-red{
+ color: red;
+ font-weight: bold;
+ }
+ .el-icon-refresh:hover{
+ color: red;
+ font-weight: bold;
+ cursor: pointer;
+ }
+}
+// 刷新框
+.refresh-div{
+ position: absolute;
+ right: 10px;
+ top: 7px;
+ z-index: 100;
+ padding: 10px;
+ color: #ce8b74;
+ font-size: 14px;
+ background-color: rgba(244, 233, 230, 1.0);
+ .font-red{
+ color: red;
+ font-weight: bold;
+ }
+ .el-icon-refresh:hover{
+ color: red;
+ font-weight: bold;
+ cursor: pointer;
+ }
+}
// 地图
.overview-map-container{
width: 100%;
@@ -980,11 +1048,11 @@
}
.cover{
position: absolute;
- bottom: 3px;
+ bottom: 0px;
left: 0px;
/*background-color: red;*/
- background-color: #000000;
+ background-color: #1a2126;
width: 100px;
- height: 25px;
+ height: 30px;
}
diff --git a/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue
deleted file mode 100644
index 8fbaa64..0000000
--- a/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue
+++ /dev/null
@@ -1,164 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
deleted file mode 100644
index c7184f4..0000000
--- a/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue b/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
deleted file mode 100644
index 543d944..0000000
--- a/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
+++ /dev/null
@@ -1,137 +0,0 @@
-
-
报警推送配置
-
报警等级配置
-
报警内容配置
-
diff --git a/src/views/systemConfig/alarmContent/listContent.vue b/src/views/systemConfig/alarmContent/listContent.vue
index 0eb72bb..1b94ce3 100644
--- a/src/views/systemConfig/alarmContent/listContent.vue
+++ b/src/views/systemConfig/alarmContent/listContent.vue
@@ -74,7 +74,7 @@
import { getAlarmType } from '@/api/alarm/alarm'
export default {
- name: 'ListContent',
+ name: 'ListAlarmContent',
components: { editAlarmContent },
data() {
return {
diff --git a/src/views/systemConfig/responsibleUser/listResponsibleUser.vue b/src/views/systemConfig/responsibleUser/listResponsibleUser.vue
index d6b2a8b..0330806 100644
--- a/src/views/systemConfig/responsibleUser/listResponsibleUser.vue
+++ b/src/views/systemConfig/responsibleUser/listResponsibleUser.vue
@@ -62,7 +62,7 @@
},
computed: {
'showOperate': function() { // 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
- return this.hasPerm('/dept/update') || this.hasPerm('/dept/delete')
+ return this.hasPerm('/sys/dept/update') || this.hasPerm('/sys/dept/delete')
}
},
created() {
diff --git a/src/views/systemConfig/tenantConfig/tenantConfig.vue b/src/views/systemConfig/tenantConfig/tenantConfig.vue
index 898bf74..dcb4d6c 100644
--- a/src/views/systemConfig/tenantConfig/tenantConfig.vue
+++ b/src/views/systemConfig/tenantConfig/tenantConfig.vue
@@ -1,249 +1,251 @@
+
-
-
-
-
+
+ 温度
+
+
+ 湿度
+
+
+
a.uptime < b.uptime ? -1 : 1)
this.list = data
this.chartData.rows = data
+ this.chartData2.rows = data
this.listLoading = false
}).catch(_ => this.listLoading = false)
},
diff --git a/src/views/deviceManage/components/listTempPressData.vue b/src/views/deviceManage/components/listTempPressData.vue
new file mode 100644
index 0000000..c41efa3
--- /dev/null
+++ b/src/views/deviceManage/components/listTempPressData.vue
@@ -0,0 +1,175 @@
+
+
+ {{ deviceForm.cell }}
+
+
{{ deviceForm.installHeight?deviceForm.installHeight+' m':'--' }}
@@ -56,10 +60,12 @@
import listHydrantData from './components/listHydrantData'
import listWellLocaData from './components/listWellLocaData'
import ListH2SData from './components/listH2SData'
+import SingleGasDetectorData from '@/views/deviceManage/components/listGasDetectorData'
export default {
name: 'EditDevice',
components: {
+ SingleGasDetectorData,
ListH2SData,
listDigData,
listGasData,
@@ -104,6 +110,7 @@
'11': 'list-hydrant-data',
'12': 'list-tube-data',
'14': 'list-h2-s-data'
+ // '101': 'single-gas-detector-data'
} // 组件对照表
}
},
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index d87cf41..1dbb51b 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -2,17 +2,29 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
@@ -49,8 +47,6 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
- 新增
-
-
-
-
-
-
- {{ scope.row[column.value] }}
-
- {{ scope.row[column.value] }}
-
-
-
-
-
-
- 编辑
-
-
- 详情
-
-
- 删除
-
-
-
-
-
-
-
- 数据列表
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 新增
-
-
-
-
-
-
- {{ scope.row[column.value] }}
-
- {{ scope.row[column.value] }}
-
-
-
-
-
-
- 编辑
-
-
- 详情
-
-
- 删除
-
-
-
-
-
-
-
- 数据列表
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/systemConfig/alarmConfig/components/alarmPushConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmPushConfig.vue
new file mode 100644
index 0000000..65e35a3
--- /dev/null
+++ b/src/views/systemConfig/alarmConfig/components/alarmPushConfig.vue
@@ -0,0 +1,144 @@
+
+
- 报警推送方式
-
-
- WEB端推送配置
-
-
- APP端推送配置
-
-
-
- 修改
-
-
- 保存
-
-
- 取消
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
index 93e9c8e..91b12b0 100644
--- a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
+++ b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
@@ -3,28 +3,28 @@
+ 报警推送方式
+
+
+ WEB端推送配置
+
+
+ APP端推送配置
+
+
+
+ 修改
+
+
+ 保存
+
+
+ 取消
+
+
+
-
-
-
+
+
-
+
-
-
-
-
-
-
-
-
+
+
+
+ WGS84
+
+
+ GCJ02
+
+
+ BD09
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
+
+
+
+ 保存
+
+
+ 取消
+
+
+
+
@@ -278,52 +279,9 @@
font-weight: 600;
}
.buttonGroup{
- margin: 20px;
- }
- .dept-div{
- padding-right: 12px;
- .box-card{
- width:100%;
- .user-dept-scroll{
- width:100%;
- height: calc(100vh - 200px);
- }
- .el-input{
- margin-bottom: 20px;
- }
+ margin-top: 20px;
+ .btn +.btn{
+ margin-left: 20px;
}
}
- $tableTitleHeight:46px;
- .table{
- margin-bottom: 20px;
- }
- .pagination-container{
- margin-bottom: 50px;
- }
- .table-title{
- background-color:rgba(243, 243, 243, 1);
- height: $tableTitleHeight;
- .title-header{
- line-height:$tableTitleHeight;
- color: #606266;
- font-size: 15px;
- i{
- margin-left: 5px;
- margin-right: 5px;
- }
- }
- }
- .edit_btns{
- .edit_btn{
- float:right;
- margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
- }
- }
-
-
diff --git a/package.json b/package.json
index 08fc1f3..4b4e458 100644
--- a/package.json
+++ b/package.json
@@ -11,6 +11,7 @@
},
"dependencies": {
"@amap/amap-jsapi-loader": "^1.0.1",
+ "@jiaminghi/data-view": "^2.10.0",
"@riophae/vue-treeselect": "^0.4.0",
"animate.css": "^4.1.1",
"axios": "^0.21.1",
@@ -29,6 +30,7 @@
"nprogress": "^0.2.0",
"uppercamelcase": "^3.0.0",
"v-charts": "^1.19.0",
+ "v-viewer": "^1.6.4",
"vue": "^2.6.11",
"vue-amap": "^0.5.10",
"vue-router": "^3.2.0",
diff --git a/src/api/data/data.js b/src/api/data/data.js
index d87e74a..c437d7b 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -97,7 +97,7 @@
// 管盯数据查询
export function getTubeData(params) {
return request({
- url: 'tubedata/list',
+ url: 'tubedata/list-page',
method: 'get',
params
})
diff --git a/src/main.js b/src/main.js
index cb309a1..1ceea3c 100644
--- a/src/main.js
+++ b/src/main.js
@@ -38,6 +38,11 @@
// 引入v-charts
import VCharts from 'v-charts'
Vue.use(VCharts)
+
+// 引入datav
+import dataV from '@jiaminghi/data-view'
+Vue.use(dataV)
+
// 引入音频文件
import audio from '@/assets/audio/alarm.mp3'
diff --git a/src/permission.js b/src/permission.js
index 96e5f73..ea80a31 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -3,9 +3,10 @@
import NProgress from 'nprogress' // progress bar 进度条
import 'nprogress/nprogress.css' // progress bar style 进度条样式
// import { Message } from 'element-ui'
-import { getToken } from '@/utils/auth' // getToken from cookie
-import { loginByToken, isSubSystem, sysCode } from './settings'
+import { getToken, getUser, setUser } from '@/utils/auth' // getToken from cookie
+import { loginByToken, isSubSystem, sysCode, loginByUsername } from './settings'
import Vue from 'vue'
+import { RSAencrypt } from '@/utils/security'
NProgress.configure({ showSpinner: false })// NProgress configuration
@@ -27,70 +28,89 @@
}).catch(() => {
next('/401') // 否则全部重定向到401没有权限页面
})
- }
- // 如果cookie中已有token，直接进行下一步
- if (oldToken) {
- // 登录后进入登录页
- if (to.path === '/login') {
- next({ path: '/' })
- NProgress.done() // if current page is dashboard will not trigger afterEach hook, so manually handle it
+ } else {
+ // 如果链接中有用户名和密码
+ const oldUser = getUser()
+ const username = to.query.username
+ const password = to.query.pwd
+ debugger
+ if (loginByUsername && username && password && !oldUser) { // 登陆后跳转
+ const loginForm = {
+ username: username,
+ password: RSAencrypt(password)
+ }
+ store.dispatch('Login', loginForm).then(() => {
+ setUser(username)
+ next({ ...to, replace: true }) // 登录成功继续
+ }).catch(() => {
+ next('/401') // 否则全部重定向到401没有权限页面
+ })
} else {
- // 当进入非登陆页时
- if (store.getters.roleList && store.getters.roleList.length === 0) { // 判断当前用户是否已拉取完user_info信息
- try {
- store.dispatch('GetInfo').then(() => {
- // 如果是子系统，参数为setting文件中的sysCode属性
- if (isSubSystem) {
- store.dispatch('GetMenus', { code: sysCode }).then((accessRoute) => {
- router.addRoutes(accessRoute)
- next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+ // 如果cookie中已有token，直接进行下一步
+ if (oldToken) {
+ // 登录后进入登录页
+ if (to.path === '/login') {
+ next({ path: '/' })
+ NProgress.done() // if current page is dashboard will not trigger afterEach hook, so manually handle it
+ } else {
+ // 当进入非登陆页时
+ if (store.getters.roleList && store.getters.roleList.length === 0) { // 判断当前用户是否已拉取完user_info信息
+ try {
+ store.dispatch('GetInfo').then(() => {
+ // 如果是子系统，参数为setting文件中的sysCode属性
+ if (isSubSystem) {
+ store.dispatch('GetMenus', { code: sysCode }).then((accessRoute) => {
+ router.addRoutes(accessRoute)
+ next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+ })
+ } else { // 否则直接获取全部菜单权限
+ store.dispatch('GetMenus').then((accessRoute) => {
+ router.addRoutes(accessRoute)
+ next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+ })
+ }
})
- } else { // 否则直接获取全部菜单权限
- store.dispatch('GetMenus').then((accessRoute) => {
- router.addRoutes(accessRoute)
- next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+ } catch (err) {
+ store.dispatch('FedLogOut').then(() => {
+ // Message.error(err || '权限验证失败，请重新登录系统')
+ next({ path: '/' })
})
}
- })
- } catch (err) {
- store.dispatch('FedLogOut').then(() => {
- // Message.error(err || '权限验证失败，请重新登录系统')
- next({ path: '/' })
- })
+ } else { // 角色不为空
+ next()
+ }
}
- } else { // 角色不为空
- next()
- }
- }
- } else {
- // has no token
- // 免登录白名单，直接进入
- if (whiteList.indexOf(to.path) !== -1) {
- next()
- } else {
- // 如果允许通过链接上的token登录
- // 获取链接里的token
- const token = to.query.token
- console.log('form other system token:' + to.query.token)
- if (loginByToken && token) {
- // 调用自动登录接口，否则跳转到登录页
- store.dispatch('TokenLogin', token).then(() => {
- console.log('自动登录成功')
- console.log(to.path)
- next({ ...to, replace: true }) // 登录成功继续
- }).catch(() => {
- next('/401') // 否则全部重定向到401没有权限页面
- })
} else {
- // 判断是独立运行的子系统还是和其他基础子系统一起的
- const config = Vue.prototype.baseConfig
- if (config.singleSys) {
- next(`/login`) // 重定向到本系统登录页
- } else { // 跳转到配置的主页
- window.location.href = config.mainPage
+ // has no token
+ // 免登录白名单，直接进入
+ if (whiteList.indexOf(to.path) !== -1) {
+ next()
+ } else {
+ // 如果允许通过链接上的token登录
+ // 获取链接里的token
+ const token = to.query.token
+ console.log('form other system token:' + to.query.token)
+ if (loginByToken && token) {
+ // 调用自动登录接口，否则跳转到登录页
+ store.dispatch('TokenLogin', token).then(() => {
+ console.log('自动登录成功')
+ console.log(to.path)
+ next({ ...to, replace: true }) // 登录成功继续
+ }).catch(() => {
+ next('/401') // 否则全部重定向到401没有权限页面
+ })
+ } else {
+ // 判断是独立运行的子系统还是和其他基础子系统一起的
+ const config = Vue.prototype.baseConfig
+ if (config.singleSys) {
+ next(`/login`) // 重定向到本系统登录页
+ } else { // 跳转到配置的主页
+ window.location.href = config.mainPage
+ }
+ }
+ NProgress.done()
}
}
- NProgress.done()
}
}
})
diff --git a/src/router/index.js b/src/router/index.js
index 4935f4a..e247d73 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -42,8 +42,12 @@
},
// 登录页面
{ path: '/login', component: () => import('@/views/login/index_2'), hidden: true },
- // 3d地图
+ // 3d地图-赣州
{ path: '/3doverview', component: () => import('@/views/overview/overview3d'), hidden: true },
+ // 章丘地图页
+ { path: '/3doverviewzq', component: () => import('@/views/overview/overview3dzq'), hidden: true },
+ // 章丘首页
+ { path: '/zqindex', component: () => import('@/views/zhangqiu/zqindex'), hidden: true },
// 404错误页面
{ path: '/404', component: () => import('@/views/errorPage/404'), hidden: true },
// 401 错误页面
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index c33329b..eccd5c6 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -13,10 +13,10 @@
},
children: [
{
- path: '/tenantConfig',
- name: 'TenantConfig',
- component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
- meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
+ path: '/responsibleUser',
+ name: 'ResponsibleUser',
+ component: () => import('@/views/systemConfig/responsibleUser/listResponsibleUser'),
+ meta: { title: '联系人配置', icon: 'function', permission: ['/responsibleUser'] }
},
{
path: '/alarmConfig',
@@ -31,28 +31,16 @@
meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
},
{
- path: '/responsibleUser',
- name: 'ResponsibleUser',
- component: () => import('@/views/systemConfig/responsibleUser/listResponsibleUser'),
- meta: { title: '联系人配置', icon: 'function', permission: ['/responsibleUser'] }
- },
- {
- path: '/alarmLevel',
- name: 'AlarmLevel',
- component: () => import('@/views/systemConfig/alarmLevel/listLevel'),
- meta: { title: '告警等级配置', icon: 'function', permission: ['/alarmLevel'] }
- },
- {
- path: '/alarmContent',
- name: 'AlarmContent',
- component: () => import('@/views/systemConfig/alarmContent/listContent'),
- meta: { title: '告警内容配置', icon: 'function', permission: ['/alarmContent'] }
- },
- {
path: '/deptPermission',
name: 'DeptPermission',
component: () => import('@/views/systemConfig/deptPermission/deptPermission'),
meta: { title: '组织权限配置', icon: 'function', permission: ['/deptPermission/list'] }
+ },
+ {
+ path: '/tenantConfig',
+ name: 'TenantConfig',
+ component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
+ meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
}
]
}]
diff --git a/src/settings.js b/src/settings.js
index 58b4117..e639076 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -40,7 +40,12 @@
* @type {Boolean}
* @description 是否允许token登录
*/
- loginByToken: false,
+ loginByToken: true,
+ /**
+ * @type {Boolean}
+ * @description 是否允许用户名+密码登录
+ */
+ loginByUsername: true,
/**
* @type {Boolean},
* @description 是否是某个子系统
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 65691f6..28fee48 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -1,6 +1,7 @@
import Cookies from 'js-cookie'
const TokenKey = 'token' // token：cookie中
+const UserKey = 'user' // token：cookie中
const PublicKey = 'public_key' // 公钥：localStorage中
const CurrentSystem = 'current_system' // 当前系统，未必每个项目都有用：localStorage中
const WsUrl = 'ws_url'
@@ -17,6 +18,18 @@
return Cookies.remove(TokenKey)
}
+export function getUser() {
+ return Cookies.get(UserKey)
+}
+
+export function setUser(user) {
+ return Cookies.set(UserKey, user)
+}
+
+export function removeUser() {
+ return Cookies.remove(UserKey)
+}
+
export function getPublicKey() {
return window.localStorage.getItem(PublicKey)
}
diff --git a/src/views/dataManage/deviceData/listGasdectorData.vue b/src/views/dataManage/deviceData/listGasdectorData.vue
index b4ecd07..f16815e 100644
--- a/src/views/dataManage/deviceData/listGasdectorData.vue
+++ b/src/views/dataManage/deviceData/listGasdectorData.vue
@@ -86,8 +86,8 @@
{ text: '设备编号', value: 'devcode', align: 'center' },
{ text: '点位编号', value: 'wellCode', align: 'center' },
{ text: '设备类型', value: 'deviceTypeName', align: 'center' },
- { text: '可燃气体浓度(%LEL)', value: 'strength', align: 'center', filter: true },
- { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
+ { text: '可燃气体浓度(%LEL)', value: 'gasSampleValue', align: 'center', filter: true },
+ { text: '电量(%)', value: 'batteryValue', width: 80, align: 'center', checkCell: true },
// {text: '状态描述',value: 'descn', align: 'center'},
{ text: '权属单位', value: 'deptName', align: 'center' },
{ text: '上传时间', value: 'uptime', width: 170, align: 'center' }
diff --git a/src/views/dataManage/deviceData/listH2SData.vue b/src/views/dataManage/deviceData/listH2SData.vue
index 1dbe14d..9eb7af5 100644
--- a/src/views/dataManage/deviceData/listH2SData.vue
+++ b/src/views/dataManage/deviceData/listH2SData.vue
@@ -71,8 +71,6 @@
data() {
return {
listQuery: {
- devcode: '', // 设备编号
- wellCode: '', // 点位编号
beginTime: '', // 开始时间
endTime: '', // 结束时间
keywords: '', // 关键字
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index e0e6ab8..b56fb95 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -166,7 +166,7 @@
this.handleDateTime()
getTubeData(this.listQuery).then(response => {
this.list = response.data.rows
- this.total = parseInt(response.data.total)
+ this.total = response.data.total
this.listLoading = false
})
},
diff --git a/src/views/deviceManage/components/listDigData.vue b/src/views/deviceManage/components/listDigData.vue
index 1467b49..87e2b94 100644
--- a/src/views/deviceManage/components/listDigData.vue
+++ b/src/views/deviceManage/components/listDigData.vue
@@ -69,7 +69,7 @@
headConfig: {
show: false
}, // 表格头配置
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listGasData.vue b/src/views/deviceManage/components/listGasData.vue
index 0cdbb7d..372ef0e 100644
--- a/src/views/deviceManage/components/listGasData.vue
+++ b/src/views/deviceManage/components/listGasData.vue
@@ -69,7 +69,7 @@
{ text: '上报时间', value: 'uptime', align: 'center' },
{ text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
], // 显示列
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listGasDetectorData.vue b/src/views/deviceManage/components/listGasDetectorData.vue
new file mode 100644
index 0000000..2f282a1
--- /dev/null
+++ b/src/views/deviceManage/components/listGasDetectorData.vue
@@ -0,0 +1,155 @@
+
+
+
+
+ 项目
+
+
-
{{ headerValue }}
+ {{ selectedTenant.tenantName }}
基础配置
NB平台配置
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/deviceManage/components/listHydrantData.vue b/src/views/deviceManage/components/listHydrantData.vue
index 8ba6cee..823201e 100644
--- a/src/views/deviceManage/components/listHydrantData.vue
+++ b/src/views/deviceManage/components/listHydrantData.vue
@@ -63,13 +63,13 @@
needIndex: false
}, // 是否需要序号列
columns: [
- { text: '上报时间', value: 'logTime', align: 'center' },
+ { text: '上报时间', value: 'logtime', align: 'center' },
{ text: '消防栓状态', value: 'descn', align: 'center' }
], // 显示列
headConfig: {
show: false
}, // 表格头配置
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listLiquidData.vue b/src/views/deviceManage/components/listLiquidData.vue
index 3b77db0..3bae830 100644
--- a/src/views/deviceManage/components/listLiquidData.vue
+++ b/src/views/deviceManage/components/listLiquidData.vue
@@ -69,7 +69,7 @@
{ text: '上报时间', value: 'uptime', align: 'center' },
{ text: '液位值', value: 'liquiddata', align: 'center' }
], // 显示列
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listNoiseData.vue b/src/views/deviceManage/components/listNoiseData.vue
index 1fb0f32..bc1024d 100644
--- a/src/views/deviceManage/components/listNoiseData.vue
+++ b/src/views/deviceManage/components/listNoiseData.vue
@@ -69,7 +69,7 @@
{ text: '上报时间', value: 'uptime', align: 'center' },
{ text: '噪声值', value: 'ddata', align: 'center' }
], // 显示列
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listTempData.vue b/src/views/deviceManage/components/listTempData.vue
index bf8136e..d2e6272 100644
--- a/src/views/deviceManage/components/listTempData.vue
+++ b/src/views/deviceManage/components/listTempData.vue
@@ -22,7 +22,15 @@
+
+
+ 设备数据情况
+
+
+
+
+
+
+
+
+
+ 温度
+
+
+ 湿度
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/deviceManage/components/listTubeData.vue b/src/views/deviceManage/components/listTubeData.vue
index 0bdd2bb..9cd3930 100644
--- a/src/views/deviceManage/components/listTubeData.vue
+++ b/src/views/deviceManage/components/listTubeData.vue
@@ -69,7 +69,7 @@
{ text: '上报时间', value: 'uptime', align: 'center' },
{ text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
], // 显示列
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listWellLocaData.vue b/src/views/deviceManage/components/listWellLocaData.vue
index 12aa64d..f1dc9de 100644
--- a/src/views/deviceManage/components/listWellLocaData.vue
+++ b/src/views/deviceManage/components/listWellLocaData.vue
@@ -70,7 +70,7 @@
headConfig: {
show: false
}, // 表格头配置
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listWellcoverData.vue b/src/views/deviceManage/components/listWellcoverData.vue
index a1d5ebc..5e3d69b 100644
--- a/src/views/deviceManage/components/listWellcoverData.vue
+++ b/src/views/deviceManage/components/listWellcoverData.vue
@@ -69,7 +69,7 @@
headConfig: {
show: false
}, // 表格头配置
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index f67d504..d51a8ce 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -20,6 +20,10 @@
{{ deviceForm.onlineStateName }}
+
+
+
+ 设备数据情况
+
+
+
+
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index 138af7a..94cbe3f 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.vue
@@ -138,11 +138,11 @@
value: 'devcode',
align: 'center'
},
- // {
- // text: '设备名称',
- // value: 'deviceName',
- // align: 'center'
- // },
+ {
+ text: '设备名称',
+ value: 'deviceName',
+ align: 'center'
+ },
{
text: '设备类型',
value: 'deviceTypeName',
diff --git a/src/views/overview/overview3dzq.vue b/src/views/overview/overview3dzq.vue
index 2297af0..988c5a8 100644
--- a/src/views/overview/overview3dzq.vue
+++ b/src/views/overview/overview3dzq.vue
@@ -35,7 +35,7 @@
import PopupDataFilter from '@/views/overview/components/popupDataFilter'
import PopupLocation from '@/views/overview/components/popupLocation'
import MapSearchComp from '@/views/overview/components/mapSearchComp'
-
+import { RSAencrypt } from '@/utils/security'
import axios from 'axios'
// import 'cesium/Source/Widgets/widgets.css'// 导入必须的样式表
// import 'cesium/Source/Cesium'// 导入必须的样式表
@@ -44,17 +44,17 @@
import 'mars3d/dist/mars3d.css'
import 'mars3d/dist/mars3d.js'
import * as mars3d from 'mars3d'
-import { RSAencrypt } from '@/utils/security'
let underground = null
-const layer2021 = null
+let layer2021 = null
+let layer2020 = null
let rqline_layer = null
let rqpoint_layer = null
let rqpoint3D_layer = null
let queryLineserver = null
let queryPointserver = null
export default {
- name: 'Overview3D',
+ name: 'Overview3dzq',
components: { MapSearchComp, PopupLocation, PopupDataFilter, ToolBox, AlarmList, AMapMarker, AMapContainer, DeptSelect },
data() {
return {
@@ -79,7 +79,7 @@
searchResultOffset: [-12, -30],
searchResultIcon: require('@/assets/overview/pure-position-icon.png'), // 报警图标
showAlarm: true, // 是否显示报警
- alpha: 100,
+ alpha: 80,
toolShow: false, // 工具栏是否显示
menus: {
menuList: [
@@ -116,7 +116,6 @@
tempMarker: null,
showClearBtn: false, // 是否显示清除查询按钮
bloomEffect: null,
- kaptcha: '',
loadToken: false
}
},
@@ -128,7 +127,9 @@
},
watch: {
alpha(val) {
- window.map.basemap.opacity = val / 100
+ window.viewer.imageryLayers._layers.forEach(layer => {
+ layer.alpha = val / 100 // 我们可以设置为0
+ })
underground.alpha = val / 100
if (val <= 90 && window.map.level >= 19) {
rqline_layer.show = false
@@ -166,7 +167,7 @@
},
beforeCreate: function() { // 从后台获取系统配置，根据配置判断是否加载验证码控件
this.$store.dispatch('GetConfig').then(() => {
- // this.$message.success('连接服务器成功')
+ this.$message.success('连接服务器成功')
this.handleLogin()
}).catch((e) => {
// this.$message.error('连接服务器失败')
@@ -178,7 +179,7 @@
const loginForm = {
sid: this.$store.getters.sid,
username: 'admin',
- password: RSAencrypt('111111')
+ password: RSAencrypt('1q2W3E4R')
}
this.$store.dispatch('Login', loginForm).then(() => {
// this.$message.success('登录成功')
@@ -204,6 +205,7 @@
tileMatrixLabels: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21']
})
var layer = window.viewer.imageryLayers.addImageryProvider(layerProvider)
+ layer.alpha = this.alpha / 100
// window.viewer.zoomTo(layer)
return layer
},
@@ -256,63 +258,85 @@
{ name: '注记', type: 'tdt', layer: 'ter_z', key: ['216ee92889e17ab1b083fae665d522b8'] },
{ name: '注记', type: 'tdt', layer: 'img_z', key: ['216ee92889e17ab1b083fae665d522b8'] }
]
- },
- {
- 'id': 1112,
- 'pid': 10,
- 'name': '天地图电子',
- 'icon': 'http://mars3d.cn/example/img/basemaps/tdt_vec.png',
- 'type': 'group',
- 'layers': [
- { 'name': '底图', 'type': 'tdt', 'layer': 'vec_d', 'key': ['216ee92889e17ab1b083fae665d522b8'] },
- { 'name': '注记', 'type': 'tdt', 'layer': 'vec_z', 'key': ['216ee92889e17ab1b083fae665d522b8'] }
- ]
- },
- {
- 'id': 1113,
- 'pid': 10,
- 'name': '天地图影像',
- 'icon': 'http://mars3d.cn/example/img/basemaps/tdt_img.png',
- 'type': 'tdt',
- 'layer': 'img_d',
- 'key': ['216ee92889e17ab1b083fae665d522b8'],
- 'show': true
}
+ // {
+ // 'id': 1112,
+ // 'pid': 10,
+ // 'name': '天地图电子',
+ // 'icon': 'http://mars3d.cn/example/img/basemaps/tdt_vec.png',
+ // 'type': 'group',
+ // 'layers': [
+ // { 'name': '底图', 'type': 'tdt', 'layer': 'vec_d', 'key': ['216ee92889e17ab1b083fae665d522b8'] },
+ // { 'name': '注记', 'type': 'tdt', 'layer': 'vec_z', 'key': ['216ee92889e17ab1b083fae665d522b8'] }
+ // ]
+ // },
+ // {
+ // 'id': 1113,
+ // 'pid': 10,
+ // 'name': '天地图影像',
+ // 'icon': 'http://mars3d.cn/example/img/basemaps/tdt_img.png',
+ // 'type': 'tdt',
+ // 'layer': 'img_d',
+ // 'key': ['216ee92889e17ab1b083fae665d522b8'],
+ // 'show': true
+ // }
]
}
Cesium.Ion.defaultAccessToken = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiI0N2E2M2ZmYi1iMDhjLTQwN2QtODZmOC0zNDZjNTMxYjgyNWEiLCJpZCI6MzY5MDMsImlhdCI6MTYwNzMzMTE2Nn0.5xsFCB0dxpcNGUkJOEpsVhUW9bf66XZIwV3hkZl09UI'
// 创建viewer实例
- // window.viewer = new Cesium.Viewer('mars3dContainer',
- // {
- // geocoder: false, // 是否显示地名查找控件
- // infoBox: false,
- // animation: false, // 是否显示动画控件(左下方那个)
- // timeline: false, // 是否显示时间线控件
- // shadows: false, // 阴影是否被太阳投射
- // showldAnimate: true, // 让场景中的动画自动播放
- // sceneModePicker: false, // 是否显示投影方式控件
- // fullscreenButton: false, // 全屏按钮不显示
- // homeButton: false,
- // navigationHelpButton: false, // 帮助按钮
- // baseLayerPicker: false,
- // imageryProvider: new Cesium.TileMapServiceImageryProvider({
- // url: Cesium.buildModuleUrl('Assets/Textures/NaturalEarthII')
- // })
- // })
+ window.viewer = new Cesium.Viewer('mars3dContainer', {
+ geocoder: false, // 是否显示地名查找控件
+ infoBox: false,
+ animation: false, // 是否显示动画控件(左下方那个)
+ timeline: false, // 是否显示时间线控件
+ shadows: false, // 阴影是否被太阳投射
+ showldAnimate: true, // 让场景中的动画自动播放
+ sceneModePicker: false, // 是否显示投影方式控件
+ fullscreenButton: false, // 全屏按钮不显示
+ homeButton: false,
+ navigationHelpButton: false, // 帮助按钮
+ baseLayerPicker: false,
+ imageryProvider: new Cesium.TileMapServiceImageryProvider({
+ url: Cesium.buildModuleUrl('Assets/Textures/NaturalEarthII')
+ })
+ })
// window.viewer.imageryLayers._layers[0].show = false
// window.viewer.scene.globe.baseColor = Cesium.Color.WHITE;
- // window.viewer._cesiumWidget._creditContainer.style.display = 'none' // 去除版权信息
+ window.viewer._cesiumWidget._creditContainer.style.display = 'none' // 去除版权信息
// mars3d.Map也可以直接传入外部已经构造好的viewer, 支持config.json所有参数
- const map = new mars3d.Map('mars3dContainer', mapOptions)
+ const map = new mars3d.Map(window.viewer, mapOptions)
- // const imgLayer = window.viewer.imageryLayers.addImageryProvider(layer)
+ const url2021 = 'http://172.20.90.108:8081/geoesb/proxy/5a44607b2e814658b463b76f9675bd3e/9bf164775ad94a18a5324f0eb681deea'
+ const url2020 = 'http://172.20.90.108:8081/geoesb/proxy/4fb75f7491c94356a9dd58a44d0dc57b/9bf164775ad94a18a5324f0eb681deea'
- // const map = new mars3d.Map('mars3dContainer', mapOptions)
- map.basemap = 1113
- // const url2021 = 'http://172.20.90.108:8081/geoesb/proxy/5a44607b2e814658b463b76f9675bd3e/9bf164775ad94a18a5324f0eb681deea'
- // const url2020 = 'http://172.20.90.108:8081/geoesb/proxy/4fb75f7491c94356a9dd58a44d0dc57b/9bf164775ad94a18a5324f0eb681deea'
- //
+ var layerProvider = new Cesium.WebMapTileServiceImageryProvider({
+ url: url2021 + '/Layers/default/Custom_Layers/{TileMatrix}/{TileRow}/{TileCol}.png',
+ layer: 'wzmap_map',
+ style: 'default',
+ tileMatrixSetID: 'default028mm',
+ format: 'image/png',
+ tilingScheme: new Cesium.GeographicTilingScheme(),
+ tileMatrixLabels: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21']
+ })
+ layer2021 = window.viewer.imageryLayers.addImageryProvider(layerProvider)
+ layer2021.alpha = this.alpha / 100
+
+ layerProvider = new Cesium.WebMapTileServiceImageryProvider({
+ url: url2020 + '?service=WMTS&request=GetTile&version=1.0.0&layer=JN2020DOM_05M&style=default&format=image/png&TileMatrixSet=CustomCRS4490ScaleJN2020DOM_05M&TileMatrix={TileMatrix}&TileRow={TileRow}&TileCol={TileCol}',
+ layer: 'wzmap_map',
+ style: 'default',
+ tileMatrixSetID: 'default028mm',
+ format: 'image/png',
+ tilingScheme: new Cesium.GeographicTilingScheme(),
+ tileMatrixLabels: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21']
+ })
+ layer2020 = window.viewer.imageryLayers.addImageryProvider(layerProvider)
+ layer2020.alpha = this.alpha / 100
+
+ layer2021.show = false
+
// layer2021 = this.SuperMap3DImageryProvider(url2021)
+ // layer2020 = this.SuperMap3DImageryProvider(url2020)
// map.scene.screenSpaceCameraController.enableCollisionDetection = false
// 设置鼠标
map.scene.screenSpaceCameraController.tiltEventTypes = [Cesium.CameraEventType.RIGHT_DRAG]
@@ -327,7 +351,7 @@
// enabled: true
// })
// map.addEffect(this.bloomEffect)
- window.map.basemap.opacity = this.alpha / 100
+ // window.map.basemap.opacity = this.alpha / 100
// 崩溃后刷新
map.on(mars3d.EventType.renderError, function(event) {
window.location.reload()
@@ -512,17 +536,22 @@
changeBaseMap(type) {
this.baseLayer = type
if (type === 'gaode_vec') {
- window.map.basemap = 1112
+ layer2021.show = true
+ layer2020.show = false
+ window.viewer.imageryLayers.raiseToTop(layer2021)
+ // window.map.basemap = 1112
// if (this.bloomEffect !== null) {
// this.bloomEffect.enabled = false
// }
} else {
- window.map.basemap = 1113
+ layer2021.show = false
+ layer2020.show = true
+ window.viewer.imageryLayers.raiseToTop(layer2020)
+ // window.map.basemap = 1113
// if (this.bloomEffect !== null) {
// this.bloomEffect.enabled = true
// }
}
- window.viewer.imageryLayers.raiseToTop(layer2021)
},
// 倒计时函数
countDown() {
@@ -756,7 +785,6 @@
// 获取当前报警列表
this.alarmListOri = response.data // 列表原始
this.alarmList = response.data // 要显示的报警列表
- this.alarmList = [{}, {}]
this.alarmWells = [] // 报警的井列表
for (const alarm of response.data) {
if (this.alarmWells.findIndex(item => item.wellCode === alarm.wellCode) == -1) {
@@ -951,6 +979,46 @@
margin-bottom: 0px;
}
}
+// 刷新框
+.function-div{
+ position: absolute;
+ right: 10px;
+ top: 7px;
+ z-index: 1100;
+ padding: 10px;
+ color: #ce8b74;
+ font-size: 14px;
+ /*background-color: rgba(244, 233, 230, 1.0);*/
+ .font-red{
+ color: red;
+ font-weight: bold;
+ }
+ .el-icon-refresh:hover{
+ color: red;
+ font-weight: bold;
+ cursor: pointer;
+ }
+}
+// 刷新框
+.refresh-div{
+ position: absolute;
+ right: 10px;
+ top: 7px;
+ z-index: 100;
+ padding: 10px;
+ color: #ce8b74;
+ font-size: 14px;
+ background-color: rgba(244, 233, 230, 1.0);
+ .font-red{
+ color: red;
+ font-weight: bold;
+ }
+ .el-icon-refresh:hover{
+ color: red;
+ font-weight: bold;
+ cursor: pointer;
+ }
+}
// 地图
.overview-map-container{
width: 100%;
@@ -980,11 +1048,11 @@
}
.cover{
position: absolute;
- bottom: 3px;
+ bottom: 0px;
left: 0px;
/*background-color: red;*/
- background-color: #000000;
+ background-color: #1a2126;
width: 100px;
- height: 25px;
+ height: 30px;
}
diff --git a/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue
deleted file mode 100644
index 8fbaa64..0000000
--- a/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue
+++ /dev/null
@@ -1,164 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
deleted file mode 100644
index c7184f4..0000000
--- a/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue b/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
deleted file mode 100644
index 543d944..0000000
--- a/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
+++ /dev/null
@@ -1,137 +0,0 @@
-
-
报警推送配置
-
报警等级配置
-
报警内容配置
-
diff --git a/src/views/systemConfig/alarmContent/listContent.vue b/src/views/systemConfig/alarmContent/listContent.vue
index 0eb72bb..1b94ce3 100644
--- a/src/views/systemConfig/alarmContent/listContent.vue
+++ b/src/views/systemConfig/alarmContent/listContent.vue
@@ -74,7 +74,7 @@
import { getAlarmType } from '@/api/alarm/alarm'
export default {
- name: 'ListContent',
+ name: 'ListAlarmContent',
components: { editAlarmContent },
data() {
return {
diff --git a/src/views/systemConfig/responsibleUser/listResponsibleUser.vue b/src/views/systemConfig/responsibleUser/listResponsibleUser.vue
index d6b2a8b..0330806 100644
--- a/src/views/systemConfig/responsibleUser/listResponsibleUser.vue
+++ b/src/views/systemConfig/responsibleUser/listResponsibleUser.vue
@@ -62,7 +62,7 @@
},
computed: {
'showOperate': function() { // 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
- return this.hasPerm('/dept/update') || this.hasPerm('/dept/delete')
+ return this.hasPerm('/sys/dept/update') || this.hasPerm('/sys/dept/delete')
}
},
created() {
diff --git a/src/views/systemConfig/tenantConfig/tenantConfig.vue b/src/views/systemConfig/tenantConfig/tenantConfig.vue
index 898bf74..dcb4d6c 100644
--- a/src/views/systemConfig/tenantConfig/tenantConfig.vue
+++ b/src/views/systemConfig/tenantConfig/tenantConfig.vue
@@ -1,249 +1,251 @@
+
-
-
-
-
-
-
-
-
- 新增
-
-
-
-
-
-
- {{ scope.row[column.value] }}
-
- {{ scope.row[column.value] }}
-
-
-
-
-
-
- 编辑
-
-
- 详情
-
-
- 删除
-
-
-
-
-
-
-
- 数据列表
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 新增
-
-
-
-
-
-
- {{ scope.row[column.value] }}
-
- {{ scope.row[column.value] }}
-
-
-
-
-
-
- 编辑
-
-
- 详情
-
-
- 删除
-
-
-
-
-
-
-
- 数据列表
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/systemConfig/alarmConfig/components/alarmPushConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmPushConfig.vue
new file mode 100644
index 0000000..65e35a3
--- /dev/null
+++ b/src/views/systemConfig/alarmConfig/components/alarmPushConfig.vue
@@ -0,0 +1,144 @@
+
+
- 报警推送方式
-
-
- WEB端推送配置
-
-
- APP端推送配置
-
-
-
- 修改
-
-
- 保存
-
-
- 取消
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
index 93e9c8e..91b12b0 100644
--- a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
+++ b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
@@ -3,28 +3,28 @@
+ 报警推送方式
+
+
+ WEB端推送配置
+
+
+ APP端推送配置
+
+
+
+ 修改
+
+
+ 保存
+
+
+ 取消
+
+
+
-
-
-
+
+
-
+
-
-
-
-
-
-
-
-
+
+
+
+ WGS84
+
+
+ GCJ02
+
+
+ BD09
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
+
+
+
+ 保存
+
+
+ 取消
+
+
+
+
@@ -278,52 +279,9 @@
font-weight: 600;
}
.buttonGroup{
- margin: 20px;
- }
- .dept-div{
- padding-right: 12px;
- .box-card{
- width:100%;
- .user-dept-scroll{
- width:100%;
- height: calc(100vh - 200px);
- }
- .el-input{
- margin-bottom: 20px;
- }
+ margin-top: 20px;
+ .btn +.btn{
+ margin-left: 20px;
}
}
- $tableTitleHeight:46px;
- .table{
- margin-bottom: 20px;
- }
- .pagination-container{
- margin-bottom: 50px;
- }
- .table-title{
- background-color:rgba(243, 243, 243, 1);
- height: $tableTitleHeight;
- .title-header{
- line-height:$tableTitleHeight;
- color: #606266;
- font-size: 15px;
- i{
- margin-left: 5px;
- margin-right: 5px;
- }
- }
- }
- .edit_btns{
- .edit_btn{
- float:right;
- margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
- }
- }
-
-
diff --git a/src/views/systemConfig/viewsConfig/components/appConfig.vue b/src/views/systemConfig/viewsConfig/components/appConfig.vue
index cdc75c9..63084ba 100644
--- a/src/views/systemConfig/viewsConfig/components/appConfig.vue
+++ b/src/views/systemConfig/viewsConfig/components/appConfig.vue
@@ -1,152 +1,118 @@
+
+
+ 项目
+
+
-
{{ headerValue }}
+ {{ selectedTenant.tenantName }}
基础配置
NB平台配置
-
-
-
-
-
-
-
+
+ 温度
+
+
+ 湿度
+
+
+
a.uptime < b.uptime ? -1 : 1)
this.list = data
this.chartData.rows = data
+ this.chartData2.rows = data
this.listLoading = false
}).catch(_ => this.listLoading = false)
},
diff --git a/src/views/deviceManage/components/listTempPressData.vue b/src/views/deviceManage/components/listTempPressData.vue
new file mode 100644
index 0000000..c41efa3
--- /dev/null
+++ b/src/views/deviceManage/components/listTempPressData.vue
@@ -0,0 +1,175 @@
+
+
+ {{ deviceForm.cell }}
+
+
{{ deviceForm.installHeight?deviceForm.installHeight+' m':'--' }}
@@ -56,10 +60,12 @@
import listHydrantData from './components/listHydrantData'
import listWellLocaData from './components/listWellLocaData'
import ListH2SData from './components/listH2SData'
+import SingleGasDetectorData from '@/views/deviceManage/components/listGasDetectorData'
export default {
name: 'EditDevice',
components: {
+ SingleGasDetectorData,
ListH2SData,
listDigData,
listGasData,
@@ -104,6 +110,7 @@
'11': 'list-hydrant-data',
'12': 'list-tube-data',
'14': 'list-h2-s-data'
+ // '101': 'single-gas-detector-data'
} // 组件对照表
}
},
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index d87cf41..1dbb51b 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -2,17 +2,29 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
@@ -49,8 +47,6 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
标题文字：
-
-
+
+
@@ -170,16 +136,40 @@
+
diff --git a/package.json b/package.json
index 08fc1f3..4b4e458 100644
--- a/package.json
+++ b/package.json
@@ -11,6 +11,7 @@
},
"dependencies": {
"@amap/amap-jsapi-loader": "^1.0.1",
+ "@jiaminghi/data-view": "^2.10.0",
"@riophae/vue-treeselect": "^0.4.0",
"animate.css": "^4.1.1",
"axios": "^0.21.1",
@@ -29,6 +30,7 @@
"nprogress": "^0.2.0",
"uppercamelcase": "^3.0.0",
"v-charts": "^1.19.0",
+ "v-viewer": "^1.6.4",
"vue": "^2.6.11",
"vue-amap": "^0.5.10",
"vue-router": "^3.2.0",
diff --git a/src/api/data/data.js b/src/api/data/data.js
index d87e74a..c437d7b 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -97,7 +97,7 @@
// 管盯数据查询
export function getTubeData(params) {
return request({
- url: 'tubedata/list',
+ url: 'tubedata/list-page',
method: 'get',
params
})
diff --git a/src/main.js b/src/main.js
index cb309a1..1ceea3c 100644
--- a/src/main.js
+++ b/src/main.js
@@ -38,6 +38,11 @@
// 引入v-charts
import VCharts from 'v-charts'
Vue.use(VCharts)
+
+// 引入datav
+import dataV from '@jiaminghi/data-view'
+Vue.use(dataV)
+
// 引入音频文件
import audio from '@/assets/audio/alarm.mp3'
diff --git a/src/permission.js b/src/permission.js
index 96e5f73..ea80a31 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -3,9 +3,10 @@
import NProgress from 'nprogress' // progress bar 进度条
import 'nprogress/nprogress.css' // progress bar style 进度条样式
// import { Message } from 'element-ui'
-import { getToken } from '@/utils/auth' // getToken from cookie
-import { loginByToken, isSubSystem, sysCode } from './settings'
+import { getToken, getUser, setUser } from '@/utils/auth' // getToken from cookie
+import { loginByToken, isSubSystem, sysCode, loginByUsername } from './settings'
import Vue from 'vue'
+import { RSAencrypt } from '@/utils/security'
NProgress.configure({ showSpinner: false })// NProgress configuration
@@ -27,70 +28,89 @@
}).catch(() => {
next('/401') // 否则全部重定向到401没有权限页面
})
- }
- // 如果cookie中已有token，直接进行下一步
- if (oldToken) {
- // 登录后进入登录页
- if (to.path === '/login') {
- next({ path: '/' })
- NProgress.done() // if current page is dashboard will not trigger afterEach hook, so manually handle it
+ } else {
+ // 如果链接中有用户名和密码
+ const oldUser = getUser()
+ const username = to.query.username
+ const password = to.query.pwd
+ debugger
+ if (loginByUsername && username && password && !oldUser) { // 登陆后跳转
+ const loginForm = {
+ username: username,
+ password: RSAencrypt(password)
+ }
+ store.dispatch('Login', loginForm).then(() => {
+ setUser(username)
+ next({ ...to, replace: true }) // 登录成功继续
+ }).catch(() => {
+ next('/401') // 否则全部重定向到401没有权限页面
+ })
} else {
- // 当进入非登陆页时
- if (store.getters.roleList && store.getters.roleList.length === 0) { // 判断当前用户是否已拉取完user_info信息
- try {
- store.dispatch('GetInfo').then(() => {
- // 如果是子系统，参数为setting文件中的sysCode属性
- if (isSubSystem) {
- store.dispatch('GetMenus', { code: sysCode }).then((accessRoute) => {
- router.addRoutes(accessRoute)
- next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+ // 如果cookie中已有token，直接进行下一步
+ if (oldToken) {
+ // 登录后进入登录页
+ if (to.path === '/login') {
+ next({ path: '/' })
+ NProgress.done() // if current page is dashboard will not trigger afterEach hook, so manually handle it
+ } else {
+ // 当进入非登陆页时
+ if (store.getters.roleList && store.getters.roleList.length === 0) { // 判断当前用户是否已拉取完user_info信息
+ try {
+ store.dispatch('GetInfo').then(() => {
+ // 如果是子系统，参数为setting文件中的sysCode属性
+ if (isSubSystem) {
+ store.dispatch('GetMenus', { code: sysCode }).then((accessRoute) => {
+ router.addRoutes(accessRoute)
+ next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+ })
+ } else { // 否则直接获取全部菜单权限
+ store.dispatch('GetMenus').then((accessRoute) => {
+ router.addRoutes(accessRoute)
+ next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+ })
+ }
})
- } else { // 否则直接获取全部菜单权限
- store.dispatch('GetMenus').then((accessRoute) => {
- router.addRoutes(accessRoute)
- next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+ } catch (err) {
+ store.dispatch('FedLogOut').then(() => {
+ // Message.error(err || '权限验证失败，请重新登录系统')
+ next({ path: '/' })
})
}
- })
- } catch (err) {
- store.dispatch('FedLogOut').then(() => {
- // Message.error(err || '权限验证失败，请重新登录系统')
- next({ path: '/' })
- })
+ } else { // 角色不为空
+ next()
+ }
}
- } else { // 角色不为空
- next()
- }
- }
- } else {
- // has no token
- // 免登录白名单，直接进入
- if (whiteList.indexOf(to.path) !== -1) {
- next()
- } else {
- // 如果允许通过链接上的token登录
- // 获取链接里的token
- const token = to.query.token
- console.log('form other system token:' + to.query.token)
- if (loginByToken && token) {
- // 调用自动登录接口，否则跳转到登录页
- store.dispatch('TokenLogin', token).then(() => {
- console.log('自动登录成功')
- console.log(to.path)
- next({ ...to, replace: true }) // 登录成功继续
- }).catch(() => {
- next('/401') // 否则全部重定向到401没有权限页面
- })
} else {
- // 判断是独立运行的子系统还是和其他基础子系统一起的
- const config = Vue.prototype.baseConfig
- if (config.singleSys) {
- next(`/login`) // 重定向到本系统登录页
- } else { // 跳转到配置的主页
- window.location.href = config.mainPage
+ // has no token
+ // 免登录白名单，直接进入
+ if (whiteList.indexOf(to.path) !== -1) {
+ next()
+ } else {
+ // 如果允许通过链接上的token登录
+ // 获取链接里的token
+ const token = to.query.token
+ console.log('form other system token:' + to.query.token)
+ if (loginByToken && token) {
+ // 调用自动登录接口，否则跳转到登录页
+ store.dispatch('TokenLogin', token).then(() => {
+ console.log('自动登录成功')
+ console.log(to.path)
+ next({ ...to, replace: true }) // 登录成功继续
+ }).catch(() => {
+ next('/401') // 否则全部重定向到401没有权限页面
+ })
+ } else {
+ // 判断是独立运行的子系统还是和其他基础子系统一起的
+ const config = Vue.prototype.baseConfig
+ if (config.singleSys) {
+ next(`/login`) // 重定向到本系统登录页
+ } else { // 跳转到配置的主页
+ window.location.href = config.mainPage
+ }
+ }
+ NProgress.done()
}
}
- NProgress.done()
}
}
})
diff --git a/src/router/index.js b/src/router/index.js
index 4935f4a..e247d73 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -42,8 +42,12 @@
},
// 登录页面
{ path: '/login', component: () => import('@/views/login/index_2'), hidden: true },
- // 3d地图
+ // 3d地图-赣州
{ path: '/3doverview', component: () => import('@/views/overview/overview3d'), hidden: true },
+ // 章丘地图页
+ { path: '/3doverviewzq', component: () => import('@/views/overview/overview3dzq'), hidden: true },
+ // 章丘首页
+ { path: '/zqindex', component: () => import('@/views/zhangqiu/zqindex'), hidden: true },
// 404错误页面
{ path: '/404', component: () => import('@/views/errorPage/404'), hidden: true },
// 401 错误页面
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index c33329b..eccd5c6 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -13,10 +13,10 @@
},
children: [
{
- path: '/tenantConfig',
- name: 'TenantConfig',
- component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
- meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
+ path: '/responsibleUser',
+ name: 'ResponsibleUser',
+ component: () => import('@/views/systemConfig/responsibleUser/listResponsibleUser'),
+ meta: { title: '联系人配置', icon: 'function', permission: ['/responsibleUser'] }
},
{
path: '/alarmConfig',
@@ -31,28 +31,16 @@
meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
},
{
- path: '/responsibleUser',
- name: 'ResponsibleUser',
- component: () => import('@/views/systemConfig/responsibleUser/listResponsibleUser'),
- meta: { title: '联系人配置', icon: 'function', permission: ['/responsibleUser'] }
- },
- {
- path: '/alarmLevel',
- name: 'AlarmLevel',
- component: () => import('@/views/systemConfig/alarmLevel/listLevel'),
- meta: { title: '告警等级配置', icon: 'function', permission: ['/alarmLevel'] }
- },
- {
- path: '/alarmContent',
- name: 'AlarmContent',
- component: () => import('@/views/systemConfig/alarmContent/listContent'),
- meta: { title: '告警内容配置', icon: 'function', permission: ['/alarmContent'] }
- },
- {
path: '/deptPermission',
name: 'DeptPermission',
component: () => import('@/views/systemConfig/deptPermission/deptPermission'),
meta: { title: '组织权限配置', icon: 'function', permission: ['/deptPermission/list'] }
+ },
+ {
+ path: '/tenantConfig',
+ name: 'TenantConfig',
+ component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
+ meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
}
]
}]
diff --git a/src/settings.js b/src/settings.js
index 58b4117..e639076 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -40,7 +40,12 @@
* @type {Boolean}
* @description 是否允许token登录
*/
- loginByToken: false,
+ loginByToken: true,
+ /**
+ * @type {Boolean}
+ * @description 是否允许用户名+密码登录
+ */
+ loginByUsername: true,
/**
* @type {Boolean},
* @description 是否是某个子系统
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 65691f6..28fee48 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -1,6 +1,7 @@
import Cookies from 'js-cookie'
const TokenKey = 'token' // token：cookie中
+const UserKey = 'user' // token：cookie中
const PublicKey = 'public_key' // 公钥：localStorage中
const CurrentSystem = 'current_system' // 当前系统，未必每个项目都有用：localStorage中
const WsUrl = 'ws_url'
@@ -17,6 +18,18 @@
return Cookies.remove(TokenKey)
}
+export function getUser() {
+ return Cookies.get(UserKey)
+}
+
+export function setUser(user) {
+ return Cookies.set(UserKey, user)
+}
+
+export function removeUser() {
+ return Cookies.remove(UserKey)
+}
+
export function getPublicKey() {
return window.localStorage.getItem(PublicKey)
}
diff --git a/src/views/dataManage/deviceData/listGasdectorData.vue b/src/views/dataManage/deviceData/listGasdectorData.vue
index b4ecd07..f16815e 100644
--- a/src/views/dataManage/deviceData/listGasdectorData.vue
+++ b/src/views/dataManage/deviceData/listGasdectorData.vue
@@ -86,8 +86,8 @@
{ text: '设备编号', value: 'devcode', align: 'center' },
{ text: '点位编号', value: 'wellCode', align: 'center' },
{ text: '设备类型', value: 'deviceTypeName', align: 'center' },
- { text: '可燃气体浓度(%LEL)', value: 'strength', align: 'center', filter: true },
- { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
+ { text: '可燃气体浓度(%LEL)', value: 'gasSampleValue', align: 'center', filter: true },
+ { text: '电量(%)', value: 'batteryValue', width: 80, align: 'center', checkCell: true },
// {text: '状态描述',value: 'descn', align: 'center'},
{ text: '权属单位', value: 'deptName', align: 'center' },
{ text: '上传时间', value: 'uptime', width: 170, align: 'center' }
diff --git a/src/views/dataManage/deviceData/listH2SData.vue b/src/views/dataManage/deviceData/listH2SData.vue
index 1dbe14d..9eb7af5 100644
--- a/src/views/dataManage/deviceData/listH2SData.vue
+++ b/src/views/dataManage/deviceData/listH2SData.vue
@@ -71,8 +71,6 @@
data() {
return {
listQuery: {
- devcode: '', // 设备编号
- wellCode: '', // 点位编号
beginTime: '', // 开始时间
endTime: '', // 结束时间
keywords: '', // 关键字
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index e0e6ab8..b56fb95 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -166,7 +166,7 @@
this.handleDateTime()
getTubeData(this.listQuery).then(response => {
this.list = response.data.rows
- this.total = parseInt(response.data.total)
+ this.total = response.data.total
this.listLoading = false
})
},
diff --git a/src/views/deviceManage/components/listDigData.vue b/src/views/deviceManage/components/listDigData.vue
index 1467b49..87e2b94 100644
--- a/src/views/deviceManage/components/listDigData.vue
+++ b/src/views/deviceManage/components/listDigData.vue
@@ -69,7 +69,7 @@
headConfig: {
show: false
}, // 表格头配置
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listGasData.vue b/src/views/deviceManage/components/listGasData.vue
index 0cdbb7d..372ef0e 100644
--- a/src/views/deviceManage/components/listGasData.vue
+++ b/src/views/deviceManage/components/listGasData.vue
@@ -69,7 +69,7 @@
{ text: '上报时间', value: 'uptime', align: 'center' },
{ text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
], // 显示列
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listGasDetectorData.vue b/src/views/deviceManage/components/listGasDetectorData.vue
new file mode 100644
index 0000000..2f282a1
--- /dev/null
+++ b/src/views/deviceManage/components/listGasDetectorData.vue
@@ -0,0 +1,155 @@
+
+
+ 标题
+
+
+
+
+
+
+ 系统Logo:
+
+
+
+
+
+
+
+
+ ![]()
-
-
- 修改
-
-
- 保存
-
-
- 取消
-
+
+
+
+
+
+ 标题文字:
+
+
+
+
+
+ 修改
+
+
+ 保存
+
+
+ 取消
+
+
+
+ 登录页
+
+
+
+
+
+ 登录页Logo:
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ ![]()
-
- 登录页文字：
-
-
-
-
- 修改
-
-
- 保存
-
-
- 取消
-
-
- 地图：
-
-
-
-
-
-
- 修改
-
-
- 保存
-
-
- 取消
-
-
-
- ![]()
-
-
- ![]()
-
-
- ![]()
-
-
+
+
+ 登录页文字:
+
+
+
+
+
+ 修改
+
+
+ 保存
+
+
+ 取消
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/deviceManage/components/listHydrantData.vue b/src/views/deviceManage/components/listHydrantData.vue
index 8ba6cee..823201e 100644
--- a/src/views/deviceManage/components/listHydrantData.vue
+++ b/src/views/deviceManage/components/listHydrantData.vue
@@ -63,13 +63,13 @@
needIndex: false
}, // 是否需要序号列
columns: [
- { text: '上报时间', value: 'logTime', align: 'center' },
+ { text: '上报时间', value: 'logtime', align: 'center' },
{ text: '消防栓状态', value: 'descn', align: 'center' }
], // 显示列
headConfig: {
show: false
}, // 表格头配置
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listLiquidData.vue b/src/views/deviceManage/components/listLiquidData.vue
index 3b77db0..3bae830 100644
--- a/src/views/deviceManage/components/listLiquidData.vue
+++ b/src/views/deviceManage/components/listLiquidData.vue
@@ -69,7 +69,7 @@
{ text: '上报时间', value: 'uptime', align: 'center' },
{ text: '液位值', value: 'liquiddata', align: 'center' }
], // 显示列
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listNoiseData.vue b/src/views/deviceManage/components/listNoiseData.vue
index 1fb0f32..bc1024d 100644
--- a/src/views/deviceManage/components/listNoiseData.vue
+++ b/src/views/deviceManage/components/listNoiseData.vue
@@ -69,7 +69,7 @@
{ text: '上报时间', value: 'uptime', align: 'center' },
{ text: '噪声值', value: 'ddata', align: 'center' }
], // 显示列
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listTempData.vue b/src/views/deviceManage/components/listTempData.vue
index bf8136e..d2e6272 100644
--- a/src/views/deviceManage/components/listTempData.vue
+++ b/src/views/deviceManage/components/listTempData.vue
@@ -22,7 +22,15 @@
+
+
+ 设备数据情况
+
+
+
+
+
+
+
+
+
+ 温度
+
+
+ 湿度
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/deviceManage/components/listTubeData.vue b/src/views/deviceManage/components/listTubeData.vue
index 0bdd2bb..9cd3930 100644
--- a/src/views/deviceManage/components/listTubeData.vue
+++ b/src/views/deviceManage/components/listTubeData.vue
@@ -69,7 +69,7 @@
{ text: '上报时间', value: 'uptime', align: 'center' },
{ text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
], // 显示列
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listWellLocaData.vue b/src/views/deviceManage/components/listWellLocaData.vue
index 12aa64d..f1dc9de 100644
--- a/src/views/deviceManage/components/listWellLocaData.vue
+++ b/src/views/deviceManage/components/listWellLocaData.vue
@@ -70,7 +70,7 @@
headConfig: {
show: false
}, // 表格头配置
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listWellcoverData.vue b/src/views/deviceManage/components/listWellcoverData.vue
index a1d5ebc..5e3d69b 100644
--- a/src/views/deviceManage/components/listWellcoverData.vue
+++ b/src/views/deviceManage/components/listWellcoverData.vue
@@ -69,7 +69,7 @@
headConfig: {
show: false
}, // 表格头配置
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index f67d504..d51a8ce 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -20,6 +20,10 @@
{{ deviceForm.onlineStateName }}
+
+
+
+ 设备数据情况
+
+
+
+
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index 138af7a..94cbe3f 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.vue
@@ -138,11 +138,11 @@
value: 'devcode',
align: 'center'
},
- // {
- // text: '设备名称',
- // value: 'deviceName',
- // align: 'center'
- // },
+ {
+ text: '设备名称',
+ value: 'deviceName',
+ align: 'center'
+ },
{
text: '设备类型',
value: 'deviceTypeName',
diff --git a/src/views/overview/overview3dzq.vue b/src/views/overview/overview3dzq.vue
index 2297af0..988c5a8 100644
--- a/src/views/overview/overview3dzq.vue
+++ b/src/views/overview/overview3dzq.vue
@@ -35,7 +35,7 @@
import PopupDataFilter from '@/views/overview/components/popupDataFilter'
import PopupLocation from '@/views/overview/components/popupLocation'
import MapSearchComp from '@/views/overview/components/mapSearchComp'
-
+import { RSAencrypt } from '@/utils/security'
import axios from 'axios'
// import 'cesium/Source/Widgets/widgets.css'// 导入必须的样式表
// import 'cesium/Source/Cesium'// 导入必须的样式表
@@ -44,17 +44,17 @@
import 'mars3d/dist/mars3d.css'
import 'mars3d/dist/mars3d.js'
import * as mars3d from 'mars3d'
-import { RSAencrypt } from '@/utils/security'
let underground = null
-const layer2021 = null
+let layer2021 = null
+let layer2020 = null
let rqline_layer = null
let rqpoint_layer = null
let rqpoint3D_layer = null
let queryLineserver = null
let queryPointserver = null
export default {
- name: 'Overview3D',
+ name: 'Overview3dzq',
components: { MapSearchComp, PopupLocation, PopupDataFilter, ToolBox, AlarmList, AMapMarker, AMapContainer, DeptSelect },
data() {
return {
@@ -79,7 +79,7 @@
searchResultOffset: [-12, -30],
searchResultIcon: require('@/assets/overview/pure-position-icon.png'), // 报警图标
showAlarm: true, // 是否显示报警
- alpha: 100,
+ alpha: 80,
toolShow: false, // 工具栏是否显示
menus: {
menuList: [
@@ -116,7 +116,6 @@
tempMarker: null,
showClearBtn: false, // 是否显示清除查询按钮
bloomEffect: null,
- kaptcha: '',
loadToken: false
}
},
@@ -128,7 +127,9 @@
},
watch: {
alpha(val) {
- window.map.basemap.opacity = val / 100
+ window.viewer.imageryLayers._layers.forEach(layer => {
+ layer.alpha = val / 100 // 我们可以设置为0
+ })
underground.alpha = val / 100
if (val <= 90 && window.map.level >= 19) {
rqline_layer.show = false
@@ -166,7 +167,7 @@
},
beforeCreate: function() { // 从后台获取系统配置，根据配置判断是否加载验证码控件
this.$store.dispatch('GetConfig').then(() => {
- // this.$message.success('连接服务器成功')
+ this.$message.success('连接服务器成功')
this.handleLogin()
}).catch((e) => {
// this.$message.error('连接服务器失败')
@@ -178,7 +179,7 @@
const loginForm = {
sid: this.$store.getters.sid,
username: 'admin',
- password: RSAencrypt('111111')
+ password: RSAencrypt('1q2W3E4R')
}
this.$store.dispatch('Login', loginForm).then(() => {
// this.$message.success('登录成功')
@@ -204,6 +205,7 @@
tileMatrixLabels: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21']
})
var layer = window.viewer.imageryLayers.addImageryProvider(layerProvider)
+ layer.alpha = this.alpha / 100
// window.viewer.zoomTo(layer)
return layer
},
@@ -256,63 +258,85 @@
{ name: '注记', type: 'tdt', layer: 'ter_z', key: ['216ee92889e17ab1b083fae665d522b8'] },
{ name: '注记', type: 'tdt', layer: 'img_z', key: ['216ee92889e17ab1b083fae665d522b8'] }
]
- },
- {
- 'id': 1112,
- 'pid': 10,
- 'name': '天地图电子',
- 'icon': 'http://mars3d.cn/example/img/basemaps/tdt_vec.png',
- 'type': 'group',
- 'layers': [
- { 'name': '底图', 'type': 'tdt', 'layer': 'vec_d', 'key': ['216ee92889e17ab1b083fae665d522b8'] },
- { 'name': '注记', 'type': 'tdt', 'layer': 'vec_z', 'key': ['216ee92889e17ab1b083fae665d522b8'] }
- ]
- },
- {
- 'id': 1113,
- 'pid': 10,
- 'name': '天地图影像',
- 'icon': 'http://mars3d.cn/example/img/basemaps/tdt_img.png',
- 'type': 'tdt',
- 'layer': 'img_d',
- 'key': ['216ee92889e17ab1b083fae665d522b8'],
- 'show': true
}
+ // {
+ // 'id': 1112,
+ // 'pid': 10,
+ // 'name': '天地图电子',
+ // 'icon': 'http://mars3d.cn/example/img/basemaps/tdt_vec.png',
+ // 'type': 'group',
+ // 'layers': [
+ // { 'name': '底图', 'type': 'tdt', 'layer': 'vec_d', 'key': ['216ee92889e17ab1b083fae665d522b8'] },
+ // { 'name': '注记', 'type': 'tdt', 'layer': 'vec_z', 'key': ['216ee92889e17ab1b083fae665d522b8'] }
+ // ]
+ // },
+ // {
+ // 'id': 1113,
+ // 'pid': 10,
+ // 'name': '天地图影像',
+ // 'icon': 'http://mars3d.cn/example/img/basemaps/tdt_img.png',
+ // 'type': 'tdt',
+ // 'layer': 'img_d',
+ // 'key': ['216ee92889e17ab1b083fae665d522b8'],
+ // 'show': true
+ // }
]
}
Cesium.Ion.defaultAccessToken = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiI0N2E2M2ZmYi1iMDhjLTQwN2QtODZmOC0zNDZjNTMxYjgyNWEiLCJpZCI6MzY5MDMsImlhdCI6MTYwNzMzMTE2Nn0.5xsFCB0dxpcNGUkJOEpsVhUW9bf66XZIwV3hkZl09UI'
// 创建viewer实例
- // window.viewer = new Cesium.Viewer('mars3dContainer',
- // {
- // geocoder: false, // 是否显示地名查找控件
- // infoBox: false,
- // animation: false, // 是否显示动画控件(左下方那个)
- // timeline: false, // 是否显示时间线控件
- // shadows: false, // 阴影是否被太阳投射
- // showldAnimate: true, // 让场景中的动画自动播放
- // sceneModePicker: false, // 是否显示投影方式控件
- // fullscreenButton: false, // 全屏按钮不显示
- // homeButton: false,
- // navigationHelpButton: false, // 帮助按钮
- // baseLayerPicker: false,
- // imageryProvider: new Cesium.TileMapServiceImageryProvider({
- // url: Cesium.buildModuleUrl('Assets/Textures/NaturalEarthII')
- // })
- // })
+ window.viewer = new Cesium.Viewer('mars3dContainer', {
+ geocoder: false, // 是否显示地名查找控件
+ infoBox: false,
+ animation: false, // 是否显示动画控件(左下方那个)
+ timeline: false, // 是否显示时间线控件
+ shadows: false, // 阴影是否被太阳投射
+ showldAnimate: true, // 让场景中的动画自动播放
+ sceneModePicker: false, // 是否显示投影方式控件
+ fullscreenButton: false, // 全屏按钮不显示
+ homeButton: false,
+ navigationHelpButton: false, // 帮助按钮
+ baseLayerPicker: false,
+ imageryProvider: new Cesium.TileMapServiceImageryProvider({
+ url: Cesium.buildModuleUrl('Assets/Textures/NaturalEarthII')
+ })
+ })
// window.viewer.imageryLayers._layers[0].show = false
// window.viewer.scene.globe.baseColor = Cesium.Color.WHITE;
- // window.viewer._cesiumWidget._creditContainer.style.display = 'none' // 去除版权信息
+ window.viewer._cesiumWidget._creditContainer.style.display = 'none' // 去除版权信息
// mars3d.Map也可以直接传入外部已经构造好的viewer, 支持config.json所有参数
- const map = new mars3d.Map('mars3dContainer', mapOptions)
+ const map = new mars3d.Map(window.viewer, mapOptions)
- // const imgLayer = window.viewer.imageryLayers.addImageryProvider(layer)
+ const url2021 = 'http://172.20.90.108:8081/geoesb/proxy/5a44607b2e814658b463b76f9675bd3e/9bf164775ad94a18a5324f0eb681deea'
+ const url2020 = 'http://172.20.90.108:8081/geoesb/proxy/4fb75f7491c94356a9dd58a44d0dc57b/9bf164775ad94a18a5324f0eb681deea'
- // const map = new mars3d.Map('mars3dContainer', mapOptions)
- map.basemap = 1113
- // const url2021 = 'http://172.20.90.108:8081/geoesb/proxy/5a44607b2e814658b463b76f9675bd3e/9bf164775ad94a18a5324f0eb681deea'
- // const url2020 = 'http://172.20.90.108:8081/geoesb/proxy/4fb75f7491c94356a9dd58a44d0dc57b/9bf164775ad94a18a5324f0eb681deea'
- //
+ var layerProvider = new Cesium.WebMapTileServiceImageryProvider({
+ url: url2021 + '/Layers/default/Custom_Layers/{TileMatrix}/{TileRow}/{TileCol}.png',
+ layer: 'wzmap_map',
+ style: 'default',
+ tileMatrixSetID: 'default028mm',
+ format: 'image/png',
+ tilingScheme: new Cesium.GeographicTilingScheme(),
+ tileMatrixLabels: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21']
+ })
+ layer2021 = window.viewer.imageryLayers.addImageryProvider(layerProvider)
+ layer2021.alpha = this.alpha / 100
+
+ layerProvider = new Cesium.WebMapTileServiceImageryProvider({
+ url: url2020 + '?service=WMTS&request=GetTile&version=1.0.0&layer=JN2020DOM_05M&style=default&format=image/png&TileMatrixSet=CustomCRS4490ScaleJN2020DOM_05M&TileMatrix={TileMatrix}&TileRow={TileRow}&TileCol={TileCol}',
+ layer: 'wzmap_map',
+ style: 'default',
+ tileMatrixSetID: 'default028mm',
+ format: 'image/png',
+ tilingScheme: new Cesium.GeographicTilingScheme(),
+ tileMatrixLabels: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21']
+ })
+ layer2020 = window.viewer.imageryLayers.addImageryProvider(layerProvider)
+ layer2020.alpha = this.alpha / 100
+
+ layer2021.show = false
+
// layer2021 = this.SuperMap3DImageryProvider(url2021)
+ // layer2020 = this.SuperMap3DImageryProvider(url2020)
// map.scene.screenSpaceCameraController.enableCollisionDetection = false
// 设置鼠标
map.scene.screenSpaceCameraController.tiltEventTypes = [Cesium.CameraEventType.RIGHT_DRAG]
@@ -327,7 +351,7 @@
// enabled: true
// })
// map.addEffect(this.bloomEffect)
- window.map.basemap.opacity = this.alpha / 100
+ // window.map.basemap.opacity = this.alpha / 100
// 崩溃后刷新
map.on(mars3d.EventType.renderError, function(event) {
window.location.reload()
@@ -512,17 +536,22 @@
changeBaseMap(type) {
this.baseLayer = type
if (type === 'gaode_vec') {
- window.map.basemap = 1112
+ layer2021.show = true
+ layer2020.show = false
+ window.viewer.imageryLayers.raiseToTop(layer2021)
+ // window.map.basemap = 1112
// if (this.bloomEffect !== null) {
// this.bloomEffect.enabled = false
// }
} else {
- window.map.basemap = 1113
+ layer2021.show = false
+ layer2020.show = true
+ window.viewer.imageryLayers.raiseToTop(layer2020)
+ // window.map.basemap = 1113
// if (this.bloomEffect !== null) {
// this.bloomEffect.enabled = true
// }
}
- window.viewer.imageryLayers.raiseToTop(layer2021)
},
// 倒计时函数
countDown() {
@@ -756,7 +785,6 @@
// 获取当前报警列表
this.alarmListOri = response.data // 列表原始
this.alarmList = response.data // 要显示的报警列表
- this.alarmList = [{}, {}]
this.alarmWells = [] // 报警的井列表
for (const alarm of response.data) {
if (this.alarmWells.findIndex(item => item.wellCode === alarm.wellCode) == -1) {
@@ -951,6 +979,46 @@
margin-bottom: 0px;
}
}
+// 刷新框
+.function-div{
+ position: absolute;
+ right: 10px;
+ top: 7px;
+ z-index: 1100;
+ padding: 10px;
+ color: #ce8b74;
+ font-size: 14px;
+ /*background-color: rgba(244, 233, 230, 1.0);*/
+ .font-red{
+ color: red;
+ font-weight: bold;
+ }
+ .el-icon-refresh:hover{
+ color: red;
+ font-weight: bold;
+ cursor: pointer;
+ }
+}
+// 刷新框
+.refresh-div{
+ position: absolute;
+ right: 10px;
+ top: 7px;
+ z-index: 100;
+ padding: 10px;
+ color: #ce8b74;
+ font-size: 14px;
+ background-color: rgba(244, 233, 230, 1.0);
+ .font-red{
+ color: red;
+ font-weight: bold;
+ }
+ .el-icon-refresh:hover{
+ color: red;
+ font-weight: bold;
+ cursor: pointer;
+ }
+}
// 地图
.overview-map-container{
width: 100%;
@@ -980,11 +1048,11 @@
}
.cover{
position: absolute;
- bottom: 3px;
+ bottom: 0px;
left: 0px;
/*background-color: red;*/
- background-color: #000000;
+ background-color: #1a2126;
width: 100px;
- height: 25px;
+ height: 30px;
}
diff --git a/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue
deleted file mode 100644
index 8fbaa64..0000000
--- a/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue
+++ /dev/null
@@ -1,164 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
deleted file mode 100644
index c7184f4..0000000
--- a/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue b/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
deleted file mode 100644
index 543d944..0000000
--- a/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
+++ /dev/null
@@ -1,137 +0,0 @@
-
-
报警推送配置
-
报警等级配置
-
报警内容配置
-
diff --git a/src/views/systemConfig/alarmContent/listContent.vue b/src/views/systemConfig/alarmContent/listContent.vue
index 0eb72bb..1b94ce3 100644
--- a/src/views/systemConfig/alarmContent/listContent.vue
+++ b/src/views/systemConfig/alarmContent/listContent.vue
@@ -74,7 +74,7 @@
import { getAlarmType } from '@/api/alarm/alarm'
export default {
- name: 'ListContent',
+ name: 'ListAlarmContent',
components: { editAlarmContent },
data() {
return {
diff --git a/src/views/systemConfig/responsibleUser/listResponsibleUser.vue b/src/views/systemConfig/responsibleUser/listResponsibleUser.vue
index d6b2a8b..0330806 100644
--- a/src/views/systemConfig/responsibleUser/listResponsibleUser.vue
+++ b/src/views/systemConfig/responsibleUser/listResponsibleUser.vue
@@ -62,7 +62,7 @@
},
computed: {
'showOperate': function() { // 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
- return this.hasPerm('/dept/update') || this.hasPerm('/dept/delete')
+ return this.hasPerm('/sys/dept/update') || this.hasPerm('/sys/dept/delete')
}
},
created() {
diff --git a/src/views/systemConfig/tenantConfig/tenantConfig.vue b/src/views/systemConfig/tenantConfig/tenantConfig.vue
index 898bf74..dcb4d6c 100644
--- a/src/views/systemConfig/tenantConfig/tenantConfig.vue
+++ b/src/views/systemConfig/tenantConfig/tenantConfig.vue
@@ -1,249 +1,251 @@
+
-
-
-
-
-
-
-
-
- 新增
-
-
-
-
-
-
- {{ scope.row[column.value] }}
-
- {{ scope.row[column.value] }}
-
-
-
-
-
-
- 编辑
-
-
- 详情
-
-
- 删除
-
-
-
-
-
-
-
- 数据列表
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 新增
-
-
-
-
-
-
- {{ scope.row[column.value] }}
-
- {{ scope.row[column.value] }}
-
-
-
-
-
-
- 编辑
-
-
- 详情
-
-
- 删除
-
-
-
-
-
-
-
- 数据列表
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/systemConfig/alarmConfig/components/alarmPushConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmPushConfig.vue
new file mode 100644
index 0000000..65e35a3
--- /dev/null
+++ b/src/views/systemConfig/alarmConfig/components/alarmPushConfig.vue
@@ -0,0 +1,144 @@
+
+
- 报警推送方式
-
-
- WEB端推送配置
-
-
- APP端推送配置
-
-
-
- 修改
-
-
- 保存
-
-
- 取消
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
index 93e9c8e..91b12b0 100644
--- a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
+++ b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
@@ -3,28 +3,28 @@
+ 报警推送方式
+
+
+ WEB端推送配置
+
+
+ APP端推送配置
+
+
+
+ 修改
+
+
+ 保存
+
+
+ 取消
+
+
+
-
-
-
+
+
-
+
-
-
-
-
-
-
-
-
+
+
+
+ WGS84
+
+
+ GCJ02
+
+
+ BD09
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
+
+
+
+ 保存
+
+
+ 取消
+
+
+
+
@@ -278,52 +279,9 @@
font-weight: 600;
}
.buttonGroup{
- margin: 20px;
- }
- .dept-div{
- padding-right: 12px;
- .box-card{
- width:100%;
- .user-dept-scroll{
- width:100%;
- height: calc(100vh - 200px);
- }
- .el-input{
- margin-bottom: 20px;
- }
+ margin-top: 20px;
+ .btn +.btn{
+ margin-left: 20px;
}
}
- $tableTitleHeight:46px;
- .table{
- margin-bottom: 20px;
- }
- .pagination-container{
- margin-bottom: 50px;
- }
- .table-title{
- background-color:rgba(243, 243, 243, 1);
- height: $tableTitleHeight;
- .title-header{
- line-height:$tableTitleHeight;
- color: #606266;
- font-size: 15px;
- i{
- margin-left: 5px;
- margin-right: 5px;
- }
- }
- }
- .edit_btns{
- .edit_btn{
- float:right;
- margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
- }
- }
-
-
diff --git a/src/views/systemConfig/viewsConfig/components/appConfig.vue b/src/views/systemConfig/viewsConfig/components/appConfig.vue
index cdc75c9..63084ba 100644
--- a/src/views/systemConfig/viewsConfig/components/appConfig.vue
+++ b/src/views/systemConfig/viewsConfig/components/appConfig.vue
@@ -1,152 +1,118 @@
+
+
+ 项目
+
+
-
{{ headerValue }}
+ {{ selectedTenant.tenantName }}
基础配置
NB平台配置
-
-
-
-
-
-
标题文字：
-
-
+
+
@@ -170,16 +136,40 @@
+
diff --git a/src/views/systemConfig/viewsConfig/components/pcConfig.vue b/src/views/systemConfig/viewsConfig/components/pcConfig.vue
index cdc75c9..82dae39 100644
--- a/src/views/systemConfig/viewsConfig/components/pcConfig.vue
+++ b/src/views/systemConfig/viewsConfig/components/pcConfig.vue
@@ -1,152 +1,155 @@
+ 标题
+
+
+
+
+
+
+ 系统Logo:
+
+
+
+
+
+
+
+
+ ![]()
-
-
- 修改
-
-
- 保存
-
-
- 取消
-
+
+
+
+
+
+ 标题文字:
+
+
+
+
+
+ 修改
+
+
+ 保存
+
+
+ 取消
+
+
+
+ 登录页
+
+
+
+
+
+ 登录页Logo:
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ ![]()
-
- 登录页文字：
-
-
-
-
- 修改
-
-
- 保存
-
-
- 取消
-
-
- 地图：
-
-
-
-
-
-
- 修改
-
-
- 保存
-
-
- 取消
-
-
-
- ![]()
-
-
- ![]()
-
-
- ![]()
-
-
+
+
+ 登录页文字:
+
+
+
+
+
+ 修改
+
+
+ 保存
+
+
+ 取消
+
+
+
-
-
-
-
-
-
标题文字：
-
-
-
+
+ 温度
+
+
+ 湿度
+
+
+
a.uptime < b.uptime ? -1 : 1)
this.list = data
this.chartData.rows = data
+ this.chartData2.rows = data
this.listLoading = false
}).catch(_ => this.listLoading = false)
},
diff --git a/src/views/deviceManage/components/listTempPressData.vue b/src/views/deviceManage/components/listTempPressData.vue
new file mode 100644
index 0000000..c41efa3
--- /dev/null
+++ b/src/views/deviceManage/components/listTempPressData.vue
@@ -0,0 +1,175 @@
+
+
+ {{ deviceForm.cell }}
+
+
{{ deviceForm.installHeight?deviceForm.installHeight+' m':'--' }}
@@ -56,10 +60,12 @@
import listHydrantData from './components/listHydrantData'
import listWellLocaData from './components/listWellLocaData'
import ListH2SData from './components/listH2SData'
+import SingleGasDetectorData from '@/views/deviceManage/components/listGasDetectorData'
export default {
name: 'EditDevice',
components: {
+ SingleGasDetectorData,
ListH2SData,
listDigData,
listGasData,
@@ -104,6 +110,7 @@
'11': 'list-hydrant-data',
'12': 'list-tube-data',
'14': 'list-h2-s-data'
+ // '101': 'single-gas-detector-data'
} // 组件对照表
}
},
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index d87cf41..1dbb51b 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -2,17 +2,29 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
@@ -49,8 +47,6 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+ 浏览器页签
+
+
+
@@ -170,16 +173,40 @@
+
diff --git a/package.json b/package.json
index 08fc1f3..4b4e458 100644
--- a/package.json
+++ b/package.json
@@ -11,6 +11,7 @@
},
"dependencies": {
"@amap/amap-jsapi-loader": "^1.0.1",
+ "@jiaminghi/data-view": "^2.10.0",
"@riophae/vue-treeselect": "^0.4.0",
"animate.css": "^4.1.1",
"axios": "^0.21.1",
@@ -29,6 +30,7 @@
"nprogress": "^0.2.0",
"uppercamelcase": "^3.0.0",
"v-charts": "^1.19.0",
+ "v-viewer": "^1.6.4",
"vue": "^2.6.11",
"vue-amap": "^0.5.10",
"vue-router": "^3.2.0",
diff --git a/src/api/data/data.js b/src/api/data/data.js
index d87e74a..c437d7b 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -97,7 +97,7 @@
// 管盯数据查询
export function getTubeData(params) {
return request({
- url: 'tubedata/list',
+ url: 'tubedata/list-page',
method: 'get',
params
})
diff --git a/src/main.js b/src/main.js
index cb309a1..1ceea3c 100644
--- a/src/main.js
+++ b/src/main.js
@@ -38,6 +38,11 @@
// 引入v-charts
import VCharts from 'v-charts'
Vue.use(VCharts)
+
+// 引入datav
+import dataV from '@jiaminghi/data-view'
+Vue.use(dataV)
+
// 引入音频文件
import audio from '@/assets/audio/alarm.mp3'
diff --git a/src/permission.js b/src/permission.js
index 96e5f73..ea80a31 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -3,9 +3,10 @@
import NProgress from 'nprogress' // progress bar 进度条
import 'nprogress/nprogress.css' // progress bar style 进度条样式
// import { Message } from 'element-ui'
-import { getToken } from '@/utils/auth' // getToken from cookie
-import { loginByToken, isSubSystem, sysCode } from './settings'
+import { getToken, getUser, setUser } from '@/utils/auth' // getToken from cookie
+import { loginByToken, isSubSystem, sysCode, loginByUsername } from './settings'
import Vue from 'vue'
+import { RSAencrypt } from '@/utils/security'
NProgress.configure({ showSpinner: false })// NProgress configuration
@@ -27,70 +28,89 @@
}).catch(() => {
next('/401') // 否则全部重定向到401没有权限页面
})
- }
- // 如果cookie中已有token，直接进行下一步
- if (oldToken) {
- // 登录后进入登录页
- if (to.path === '/login') {
- next({ path: '/' })
- NProgress.done() // if current page is dashboard will not trigger afterEach hook, so manually handle it
+ } else {
+ // 如果链接中有用户名和密码
+ const oldUser = getUser()
+ const username = to.query.username
+ const password = to.query.pwd
+ debugger
+ if (loginByUsername && username && password && !oldUser) { // 登陆后跳转
+ const loginForm = {
+ username: username,
+ password: RSAencrypt(password)
+ }
+ store.dispatch('Login', loginForm).then(() => {
+ setUser(username)
+ next({ ...to, replace: true }) // 登录成功继续
+ }).catch(() => {
+ next('/401') // 否则全部重定向到401没有权限页面
+ })
} else {
- // 当进入非登陆页时
- if (store.getters.roleList && store.getters.roleList.length === 0) { // 判断当前用户是否已拉取完user_info信息
- try {
- store.dispatch('GetInfo').then(() => {
- // 如果是子系统，参数为setting文件中的sysCode属性
- if (isSubSystem) {
- store.dispatch('GetMenus', { code: sysCode }).then((accessRoute) => {
- router.addRoutes(accessRoute)
- next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+ // 如果cookie中已有token，直接进行下一步
+ if (oldToken) {
+ // 登录后进入登录页
+ if (to.path === '/login') {
+ next({ path: '/' })
+ NProgress.done() // if current page is dashboard will not trigger afterEach hook, so manually handle it
+ } else {
+ // 当进入非登陆页时
+ if (store.getters.roleList && store.getters.roleList.length === 0) { // 判断当前用户是否已拉取完user_info信息
+ try {
+ store.dispatch('GetInfo').then(() => {
+ // 如果是子系统，参数为setting文件中的sysCode属性
+ if (isSubSystem) {
+ store.dispatch('GetMenus', { code: sysCode }).then((accessRoute) => {
+ router.addRoutes(accessRoute)
+ next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+ })
+ } else { // 否则直接获取全部菜单权限
+ store.dispatch('GetMenus').then((accessRoute) => {
+ router.addRoutes(accessRoute)
+ next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+ })
+ }
})
- } else { // 否则直接获取全部菜单权限
- store.dispatch('GetMenus').then((accessRoute) => {
- router.addRoutes(accessRoute)
- next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+ } catch (err) {
+ store.dispatch('FedLogOut').then(() => {
+ // Message.error(err || '权限验证失败，请重新登录系统')
+ next({ path: '/' })
})
}
- })
- } catch (err) {
- store.dispatch('FedLogOut').then(() => {
- // Message.error(err || '权限验证失败，请重新登录系统')
- next({ path: '/' })
- })
+ } else { // 角色不为空
+ next()
+ }
}
- } else { // 角色不为空
- next()
- }
- }
- } else {
- // has no token
- // 免登录白名单，直接进入
- if (whiteList.indexOf(to.path) !== -1) {
- next()
- } else {
- // 如果允许通过链接上的token登录
- // 获取链接里的token
- const token = to.query.token
- console.log('form other system token:' + to.query.token)
- if (loginByToken && token) {
- // 调用自动登录接口，否则跳转到登录页
- store.dispatch('TokenLogin', token).then(() => {
- console.log('自动登录成功')
- console.log(to.path)
- next({ ...to, replace: true }) // 登录成功继续
- }).catch(() => {
- next('/401') // 否则全部重定向到401没有权限页面
- })
} else {
- // 判断是独立运行的子系统还是和其他基础子系统一起的
- const config = Vue.prototype.baseConfig
- if (config.singleSys) {
- next(`/login`) // 重定向到本系统登录页
- } else { // 跳转到配置的主页
- window.location.href = config.mainPage
+ // has no token
+ // 免登录白名单，直接进入
+ if (whiteList.indexOf(to.path) !== -1) {
+ next()
+ } else {
+ // 如果允许通过链接上的token登录
+ // 获取链接里的token
+ const token = to.query.token
+ console.log('form other system token:' + to.query.token)
+ if (loginByToken && token) {
+ // 调用自动登录接口，否则跳转到登录页
+ store.dispatch('TokenLogin', token).then(() => {
+ console.log('自动登录成功')
+ console.log(to.path)
+ next({ ...to, replace: true }) // 登录成功继续
+ }).catch(() => {
+ next('/401') // 否则全部重定向到401没有权限页面
+ })
+ } else {
+ // 判断是独立运行的子系统还是和其他基础子系统一起的
+ const config = Vue.prototype.baseConfig
+ if (config.singleSys) {
+ next(`/login`) // 重定向到本系统登录页
+ } else { // 跳转到配置的主页
+ window.location.href = config.mainPage
+ }
+ }
+ NProgress.done()
}
}
- NProgress.done()
}
}
})
diff --git a/src/router/index.js b/src/router/index.js
index 4935f4a..e247d73 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -42,8 +42,12 @@
},
// 登录页面
{ path: '/login', component: () => import('@/views/login/index_2'), hidden: true },
- // 3d地图
+ // 3d地图-赣州
{ path: '/3doverview', component: () => import('@/views/overview/overview3d'), hidden: true },
+ // 章丘地图页
+ { path: '/3doverviewzq', component: () => import('@/views/overview/overview3dzq'), hidden: true },
+ // 章丘首页
+ { path: '/zqindex', component: () => import('@/views/zhangqiu/zqindex'), hidden: true },
// 404错误页面
{ path: '/404', component: () => import('@/views/errorPage/404'), hidden: true },
// 401 错误页面
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index c33329b..eccd5c6 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -13,10 +13,10 @@
},
children: [
{
- path: '/tenantConfig',
- name: 'TenantConfig',
- component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
- meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
+ path: '/responsibleUser',
+ name: 'ResponsibleUser',
+ component: () => import('@/views/systemConfig/responsibleUser/listResponsibleUser'),
+ meta: { title: '联系人配置', icon: 'function', permission: ['/responsibleUser'] }
},
{
path: '/alarmConfig',
@@ -31,28 +31,16 @@
meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
},
{
- path: '/responsibleUser',
- name: 'ResponsibleUser',
- component: () => import('@/views/systemConfig/responsibleUser/listResponsibleUser'),
- meta: { title: '联系人配置', icon: 'function', permission: ['/responsibleUser'] }
- },
- {
- path: '/alarmLevel',
- name: 'AlarmLevel',
- component: () => import('@/views/systemConfig/alarmLevel/listLevel'),
- meta: { title: '告警等级配置', icon: 'function', permission: ['/alarmLevel'] }
- },
- {
- path: '/alarmContent',
- name: 'AlarmContent',
- component: () => import('@/views/systemConfig/alarmContent/listContent'),
- meta: { title: '告警内容配置', icon: 'function', permission: ['/alarmContent'] }
- },
- {
path: '/deptPermission',
name: 'DeptPermission',
component: () => import('@/views/systemConfig/deptPermission/deptPermission'),
meta: { title: '组织权限配置', icon: 'function', permission: ['/deptPermission/list'] }
+ },
+ {
+ path: '/tenantConfig',
+ name: 'TenantConfig',
+ component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
+ meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
}
]
}]
diff --git a/src/settings.js b/src/settings.js
index 58b4117..e639076 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -40,7 +40,12 @@
* @type {Boolean}
* @description 是否允许token登录
*/
- loginByToken: false,
+ loginByToken: true,
+ /**
+ * @type {Boolean}
+ * @description 是否允许用户名+密码登录
+ */
+ loginByUsername: true,
/**
* @type {Boolean},
* @description 是否是某个子系统
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 65691f6..28fee48 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -1,6 +1,7 @@
import Cookies from 'js-cookie'
const TokenKey = 'token' // token：cookie中
+const UserKey = 'user' // token：cookie中
const PublicKey = 'public_key' // 公钥：localStorage中
const CurrentSystem = 'current_system' // 当前系统，未必每个项目都有用：localStorage中
const WsUrl = 'ws_url'
@@ -17,6 +18,18 @@
return Cookies.remove(TokenKey)
}
+export function getUser() {
+ return Cookies.get(UserKey)
+}
+
+export function setUser(user) {
+ return Cookies.set(UserKey, user)
+}
+
+export function removeUser() {
+ return Cookies.remove(UserKey)
+}
+
export function getPublicKey() {
return window.localStorage.getItem(PublicKey)
}
diff --git a/src/views/dataManage/deviceData/listGasdectorData.vue b/src/views/dataManage/deviceData/listGasdectorData.vue
index b4ecd07..f16815e 100644
--- a/src/views/dataManage/deviceData/listGasdectorData.vue
+++ b/src/views/dataManage/deviceData/listGasdectorData.vue
@@ -86,8 +86,8 @@
{ text: '设备编号', value: 'devcode', align: 'center' },
{ text: '点位编号', value: 'wellCode', align: 'center' },
{ text: '设备类型', value: 'deviceTypeName', align: 'center' },
- { text: '可燃气体浓度(%LEL)', value: 'strength', align: 'center', filter: true },
- { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
+ { text: '可燃气体浓度(%LEL)', value: 'gasSampleValue', align: 'center', filter: true },
+ { text: '电量(%)', value: 'batteryValue', width: 80, align: 'center', checkCell: true },
// {text: '状态描述',value: 'descn', align: 'center'},
{ text: '权属单位', value: 'deptName', align: 'center' },
{ text: '上传时间', value: 'uptime', width: 170, align: 'center' }
diff --git a/src/views/dataManage/deviceData/listH2SData.vue b/src/views/dataManage/deviceData/listH2SData.vue
index 1dbe14d..9eb7af5 100644
--- a/src/views/dataManage/deviceData/listH2SData.vue
+++ b/src/views/dataManage/deviceData/listH2SData.vue
@@ -71,8 +71,6 @@
data() {
return {
listQuery: {
- devcode: '', // 设备编号
- wellCode: '', // 点位编号
beginTime: '', // 开始时间
endTime: '', // 结束时间
keywords: '', // 关键字
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index e0e6ab8..b56fb95 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -166,7 +166,7 @@
this.handleDateTime()
getTubeData(this.listQuery).then(response => {
this.list = response.data.rows
- this.total = parseInt(response.data.total)
+ this.total = response.data.total
this.listLoading = false
})
},
diff --git a/src/views/deviceManage/components/listDigData.vue b/src/views/deviceManage/components/listDigData.vue
index 1467b49..87e2b94 100644
--- a/src/views/deviceManage/components/listDigData.vue
+++ b/src/views/deviceManage/components/listDigData.vue
@@ -69,7 +69,7 @@
headConfig: {
show: false
}, // 表格头配置
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listGasData.vue b/src/views/deviceManage/components/listGasData.vue
index 0cdbb7d..372ef0e 100644
--- a/src/views/deviceManage/components/listGasData.vue
+++ b/src/views/deviceManage/components/listGasData.vue
@@ -69,7 +69,7 @@
{ text: '上报时间', value: 'uptime', align: 'center' },
{ text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
], // 显示列
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listGasDetectorData.vue b/src/views/deviceManage/components/listGasDetectorData.vue
new file mode 100644
index 0000000..2f282a1
--- /dev/null
+++ b/src/views/deviceManage/components/listGasDetectorData.vue
@@ -0,0 +1,155 @@
+
+
+
+
+
+ 页签Logo:
+
+
+
+
+
+
+
+
+ ![]()
-
-
- 修改
-
-
- 保存
-
-
- 取消
-
+
+
+
+ 标题
+
+
+
+
+
+
+ 系统Logo:
+
+
+
+
+
+
+
-
+
+ ![]()
-
- 登录页文字：
-
-
+
+
+
+ 标题文字:
+
+
+
+
+
+ 修改
+
+
+ 保存
+
+
+ 取消
+
+
+
+ 登录页
+
+
+
+
+
+ 登录页Logo:
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ ![]()
-
-
- 修改
-
-
- 保存
-
-
- 取消
-
-
-
- 地图：
-
-
-
-
-
-
- 修改
-
-
- 保存
-
-
- 取消
-
-
-
- ![]()
-
-
- ![]()
-
-
- ![]()
-
-
+
+
+ 登录页文字:
+
+
+
+
+
+ 修改
+
+
+ 保存
+
+
+ 取消
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/deviceManage/components/listHydrantData.vue b/src/views/deviceManage/components/listHydrantData.vue
index 8ba6cee..823201e 100644
--- a/src/views/deviceManage/components/listHydrantData.vue
+++ b/src/views/deviceManage/components/listHydrantData.vue
@@ -63,13 +63,13 @@
needIndex: false
}, // 是否需要序号列
columns: [
- { text: '上报时间', value: 'logTime', align: 'center' },
+ { text: '上报时间', value: 'logtime', align: 'center' },
{ text: '消防栓状态', value: 'descn', align: 'center' }
], // 显示列
headConfig: {
show: false
}, // 表格头配置
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listLiquidData.vue b/src/views/deviceManage/components/listLiquidData.vue
index 3b77db0..3bae830 100644
--- a/src/views/deviceManage/components/listLiquidData.vue
+++ b/src/views/deviceManage/components/listLiquidData.vue
@@ -69,7 +69,7 @@
{ text: '上报时间', value: 'uptime', align: 'center' },
{ text: '液位值', value: 'liquiddata', align: 'center' }
], // 显示列
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listNoiseData.vue b/src/views/deviceManage/components/listNoiseData.vue
index 1fb0f32..bc1024d 100644
--- a/src/views/deviceManage/components/listNoiseData.vue
+++ b/src/views/deviceManage/components/listNoiseData.vue
@@ -69,7 +69,7 @@
{ text: '上报时间', value: 'uptime', align: 'center' },
{ text: '噪声值', value: 'ddata', align: 'center' }
], // 显示列
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listTempData.vue b/src/views/deviceManage/components/listTempData.vue
index bf8136e..d2e6272 100644
--- a/src/views/deviceManage/components/listTempData.vue
+++ b/src/views/deviceManage/components/listTempData.vue
@@ -22,7 +22,15 @@
+
+
+ 设备数据情况
+
+
+
+
+
+
+
+
+
+ 温度
+
+
+ 湿度
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/deviceManage/components/listTubeData.vue b/src/views/deviceManage/components/listTubeData.vue
index 0bdd2bb..9cd3930 100644
--- a/src/views/deviceManage/components/listTubeData.vue
+++ b/src/views/deviceManage/components/listTubeData.vue
@@ -69,7 +69,7 @@
{ text: '上报时间', value: 'uptime', align: 'center' },
{ text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
], // 显示列
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listWellLocaData.vue b/src/views/deviceManage/components/listWellLocaData.vue
index 12aa64d..f1dc9de 100644
--- a/src/views/deviceManage/components/listWellLocaData.vue
+++ b/src/views/deviceManage/components/listWellLocaData.vue
@@ -70,7 +70,7 @@
headConfig: {
show: false
}, // 表格头配置
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listWellcoverData.vue b/src/views/deviceManage/components/listWellcoverData.vue
index a1d5ebc..5e3d69b 100644
--- a/src/views/deviceManage/components/listWellcoverData.vue
+++ b/src/views/deviceManage/components/listWellcoverData.vue
@@ -69,7 +69,7 @@
headConfig: {
show: false
}, // 表格头配置
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index f67d504..d51a8ce 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -20,6 +20,10 @@
{{ deviceForm.onlineStateName }}
+
+
+
+ 设备数据情况
+
+
+
+
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index 138af7a..94cbe3f 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.vue
@@ -138,11 +138,11 @@
value: 'devcode',
align: 'center'
},
- // {
- // text: '设备名称',
- // value: 'deviceName',
- // align: 'center'
- // },
+ {
+ text: '设备名称',
+ value: 'deviceName',
+ align: 'center'
+ },
{
text: '设备类型',
value: 'deviceTypeName',
diff --git a/src/views/overview/overview3dzq.vue b/src/views/overview/overview3dzq.vue
index 2297af0..988c5a8 100644
--- a/src/views/overview/overview3dzq.vue
+++ b/src/views/overview/overview3dzq.vue
@@ -35,7 +35,7 @@
import PopupDataFilter from '@/views/overview/components/popupDataFilter'
import PopupLocation from '@/views/overview/components/popupLocation'
import MapSearchComp from '@/views/overview/components/mapSearchComp'
-
+import { RSAencrypt } from '@/utils/security'
import axios from 'axios'
// import 'cesium/Source/Widgets/widgets.css'// 导入必须的样式表
// import 'cesium/Source/Cesium'// 导入必须的样式表
@@ -44,17 +44,17 @@
import 'mars3d/dist/mars3d.css'
import 'mars3d/dist/mars3d.js'
import * as mars3d from 'mars3d'
-import { RSAencrypt } from '@/utils/security'
let underground = null
-const layer2021 = null
+let layer2021 = null
+let layer2020 = null
let rqline_layer = null
let rqpoint_layer = null
let rqpoint3D_layer = null
let queryLineserver = null
let queryPointserver = null
export default {
- name: 'Overview3D',
+ name: 'Overview3dzq',
components: { MapSearchComp, PopupLocation, PopupDataFilter, ToolBox, AlarmList, AMapMarker, AMapContainer, DeptSelect },
data() {
return {
@@ -79,7 +79,7 @@
searchResultOffset: [-12, -30],
searchResultIcon: require('@/assets/overview/pure-position-icon.png'), // 报警图标
showAlarm: true, // 是否显示报警
- alpha: 100,
+ alpha: 80,
toolShow: false, // 工具栏是否显示
menus: {
menuList: [
@@ -116,7 +116,6 @@
tempMarker: null,
showClearBtn: false, // 是否显示清除查询按钮
bloomEffect: null,
- kaptcha: '',
loadToken: false
}
},
@@ -128,7 +127,9 @@
},
watch: {
alpha(val) {
- window.map.basemap.opacity = val / 100
+ window.viewer.imageryLayers._layers.forEach(layer => {
+ layer.alpha = val / 100 // 我们可以设置为0
+ })
underground.alpha = val / 100
if (val <= 90 && window.map.level >= 19) {
rqline_layer.show = false
@@ -166,7 +167,7 @@
},
beforeCreate: function() { // 从后台获取系统配置，根据配置判断是否加载验证码控件
this.$store.dispatch('GetConfig').then(() => {
- // this.$message.success('连接服务器成功')
+ this.$message.success('连接服务器成功')
this.handleLogin()
}).catch((e) => {
// this.$message.error('连接服务器失败')
@@ -178,7 +179,7 @@
const loginForm = {
sid: this.$store.getters.sid,
username: 'admin',
- password: RSAencrypt('111111')
+ password: RSAencrypt('1q2W3E4R')
}
this.$store.dispatch('Login', loginForm).then(() => {
// this.$message.success('登录成功')
@@ -204,6 +205,7 @@
tileMatrixLabels: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21']
})
var layer = window.viewer.imageryLayers.addImageryProvider(layerProvider)
+ layer.alpha = this.alpha / 100
// window.viewer.zoomTo(layer)
return layer
},
@@ -256,63 +258,85 @@
{ name: '注记', type: 'tdt', layer: 'ter_z', key: ['216ee92889e17ab1b083fae665d522b8'] },
{ name: '注记', type: 'tdt', layer: 'img_z', key: ['216ee92889e17ab1b083fae665d522b8'] }
]
- },
- {
- 'id': 1112,
- 'pid': 10,
- 'name': '天地图电子',
- 'icon': 'http://mars3d.cn/example/img/basemaps/tdt_vec.png',
- 'type': 'group',
- 'layers': [
- { 'name': '底图', 'type': 'tdt', 'layer': 'vec_d', 'key': ['216ee92889e17ab1b083fae665d522b8'] },
- { 'name': '注记', 'type': 'tdt', 'layer': 'vec_z', 'key': ['216ee92889e17ab1b083fae665d522b8'] }
- ]
- },
- {
- 'id': 1113,
- 'pid': 10,
- 'name': '天地图影像',
- 'icon': 'http://mars3d.cn/example/img/basemaps/tdt_img.png',
- 'type': 'tdt',
- 'layer': 'img_d',
- 'key': ['216ee92889e17ab1b083fae665d522b8'],
- 'show': true
}
+ // {
+ // 'id': 1112,
+ // 'pid': 10,
+ // 'name': '天地图电子',
+ // 'icon': 'http://mars3d.cn/example/img/basemaps/tdt_vec.png',
+ // 'type': 'group',
+ // 'layers': [
+ // { 'name': '底图', 'type': 'tdt', 'layer': 'vec_d', 'key': ['216ee92889e17ab1b083fae665d522b8'] },
+ // { 'name': '注记', 'type': 'tdt', 'layer': 'vec_z', 'key': ['216ee92889e17ab1b083fae665d522b8'] }
+ // ]
+ // },
+ // {
+ // 'id': 1113,
+ // 'pid': 10,
+ // 'name': '天地图影像',
+ // 'icon': 'http://mars3d.cn/example/img/basemaps/tdt_img.png',
+ // 'type': 'tdt',
+ // 'layer': 'img_d',
+ // 'key': ['216ee92889e17ab1b083fae665d522b8'],
+ // 'show': true
+ // }
]
}
Cesium.Ion.defaultAccessToken = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiI0N2E2M2ZmYi1iMDhjLTQwN2QtODZmOC0zNDZjNTMxYjgyNWEiLCJpZCI6MzY5MDMsImlhdCI6MTYwNzMzMTE2Nn0.5xsFCB0dxpcNGUkJOEpsVhUW9bf66XZIwV3hkZl09UI'
// 创建viewer实例
- // window.viewer = new Cesium.Viewer('mars3dContainer',
- // {
- // geocoder: false, // 是否显示地名查找控件
- // infoBox: false,
- // animation: false, // 是否显示动画控件(左下方那个)
- // timeline: false, // 是否显示时间线控件
- // shadows: false, // 阴影是否被太阳投射
- // showldAnimate: true, // 让场景中的动画自动播放
- // sceneModePicker: false, // 是否显示投影方式控件
- // fullscreenButton: false, // 全屏按钮不显示
- // homeButton: false,
- // navigationHelpButton: false, // 帮助按钮
- // baseLayerPicker: false,
- // imageryProvider: new Cesium.TileMapServiceImageryProvider({
- // url: Cesium.buildModuleUrl('Assets/Textures/NaturalEarthII')
- // })
- // })
+ window.viewer = new Cesium.Viewer('mars3dContainer', {
+ geocoder: false, // 是否显示地名查找控件
+ infoBox: false,
+ animation: false, // 是否显示动画控件(左下方那个)
+ timeline: false, // 是否显示时间线控件
+ shadows: false, // 阴影是否被太阳投射
+ showldAnimate: true, // 让场景中的动画自动播放
+ sceneModePicker: false, // 是否显示投影方式控件
+ fullscreenButton: false, // 全屏按钮不显示
+ homeButton: false,
+ navigationHelpButton: false, // 帮助按钮
+ baseLayerPicker: false,
+ imageryProvider: new Cesium.TileMapServiceImageryProvider({
+ url: Cesium.buildModuleUrl('Assets/Textures/NaturalEarthII')
+ })
+ })
// window.viewer.imageryLayers._layers[0].show = false
// window.viewer.scene.globe.baseColor = Cesium.Color.WHITE;
- // window.viewer._cesiumWidget._creditContainer.style.display = 'none' // 去除版权信息
+ window.viewer._cesiumWidget._creditContainer.style.display = 'none' // 去除版权信息
// mars3d.Map也可以直接传入外部已经构造好的viewer, 支持config.json所有参数
- const map = new mars3d.Map('mars3dContainer', mapOptions)
+ const map = new mars3d.Map(window.viewer, mapOptions)
- // const imgLayer = window.viewer.imageryLayers.addImageryProvider(layer)
+ const url2021 = 'http://172.20.90.108:8081/geoesb/proxy/5a44607b2e814658b463b76f9675bd3e/9bf164775ad94a18a5324f0eb681deea'
+ const url2020 = 'http://172.20.90.108:8081/geoesb/proxy/4fb75f7491c94356a9dd58a44d0dc57b/9bf164775ad94a18a5324f0eb681deea'
- // const map = new mars3d.Map('mars3dContainer', mapOptions)
- map.basemap = 1113
- // const url2021 = 'http://172.20.90.108:8081/geoesb/proxy/5a44607b2e814658b463b76f9675bd3e/9bf164775ad94a18a5324f0eb681deea'
- // const url2020 = 'http://172.20.90.108:8081/geoesb/proxy/4fb75f7491c94356a9dd58a44d0dc57b/9bf164775ad94a18a5324f0eb681deea'
- //
+ var layerProvider = new Cesium.WebMapTileServiceImageryProvider({
+ url: url2021 + '/Layers/default/Custom_Layers/{TileMatrix}/{TileRow}/{TileCol}.png',
+ layer: 'wzmap_map',
+ style: 'default',
+ tileMatrixSetID: 'default028mm',
+ format: 'image/png',
+ tilingScheme: new Cesium.GeographicTilingScheme(),
+ tileMatrixLabels: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21']
+ })
+ layer2021 = window.viewer.imageryLayers.addImageryProvider(layerProvider)
+ layer2021.alpha = this.alpha / 100
+
+ layerProvider = new Cesium.WebMapTileServiceImageryProvider({
+ url: url2020 + '?service=WMTS&request=GetTile&version=1.0.0&layer=JN2020DOM_05M&style=default&format=image/png&TileMatrixSet=CustomCRS4490ScaleJN2020DOM_05M&TileMatrix={TileMatrix}&TileRow={TileRow}&TileCol={TileCol}',
+ layer: 'wzmap_map',
+ style: 'default',
+ tileMatrixSetID: 'default028mm',
+ format: 'image/png',
+ tilingScheme: new Cesium.GeographicTilingScheme(),
+ tileMatrixLabels: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21']
+ })
+ layer2020 = window.viewer.imageryLayers.addImageryProvider(layerProvider)
+ layer2020.alpha = this.alpha / 100
+
+ layer2021.show = false
+
// layer2021 = this.SuperMap3DImageryProvider(url2021)
+ // layer2020 = this.SuperMap3DImageryProvider(url2020)
// map.scene.screenSpaceCameraController.enableCollisionDetection = false
// 设置鼠标
map.scene.screenSpaceCameraController.tiltEventTypes = [Cesium.CameraEventType.RIGHT_DRAG]
@@ -327,7 +351,7 @@
// enabled: true
// })
// map.addEffect(this.bloomEffect)
- window.map.basemap.opacity = this.alpha / 100
+ // window.map.basemap.opacity = this.alpha / 100
// 崩溃后刷新
map.on(mars3d.EventType.renderError, function(event) {
window.location.reload()
@@ -512,17 +536,22 @@
changeBaseMap(type) {
this.baseLayer = type
if (type === 'gaode_vec') {
- window.map.basemap = 1112
+ layer2021.show = true
+ layer2020.show = false
+ window.viewer.imageryLayers.raiseToTop(layer2021)
+ // window.map.basemap = 1112
// if (this.bloomEffect !== null) {
// this.bloomEffect.enabled = false
// }
} else {
- window.map.basemap = 1113
+ layer2021.show = false
+ layer2020.show = true
+ window.viewer.imageryLayers.raiseToTop(layer2020)
+ // window.map.basemap = 1113
// if (this.bloomEffect !== null) {
// this.bloomEffect.enabled = true
// }
}
- window.viewer.imageryLayers.raiseToTop(layer2021)
},
// 倒计时函数
countDown() {
@@ -756,7 +785,6 @@
// 获取当前报警列表
this.alarmListOri = response.data // 列表原始
this.alarmList = response.data // 要显示的报警列表
- this.alarmList = [{}, {}]
this.alarmWells = [] // 报警的井列表
for (const alarm of response.data) {
if (this.alarmWells.findIndex(item => item.wellCode === alarm.wellCode) == -1) {
@@ -951,6 +979,46 @@
margin-bottom: 0px;
}
}
+// 刷新框
+.function-div{
+ position: absolute;
+ right: 10px;
+ top: 7px;
+ z-index: 1100;
+ padding: 10px;
+ color: #ce8b74;
+ font-size: 14px;
+ /*background-color: rgba(244, 233, 230, 1.0);*/
+ .font-red{
+ color: red;
+ font-weight: bold;
+ }
+ .el-icon-refresh:hover{
+ color: red;
+ font-weight: bold;
+ cursor: pointer;
+ }
+}
+// 刷新框
+.refresh-div{
+ position: absolute;
+ right: 10px;
+ top: 7px;
+ z-index: 100;
+ padding: 10px;
+ color: #ce8b74;
+ font-size: 14px;
+ background-color: rgba(244, 233, 230, 1.0);
+ .font-red{
+ color: red;
+ font-weight: bold;
+ }
+ .el-icon-refresh:hover{
+ color: red;
+ font-weight: bold;
+ cursor: pointer;
+ }
+}
// 地图
.overview-map-container{
width: 100%;
@@ -980,11 +1048,11 @@
}
.cover{
position: absolute;
- bottom: 3px;
+ bottom: 0px;
left: 0px;
/*background-color: red;*/
- background-color: #000000;
+ background-color: #1a2126;
width: 100px;
- height: 25px;
+ height: 30px;
}
diff --git a/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue
deleted file mode 100644
index 8fbaa64..0000000
--- a/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue
+++ /dev/null
@@ -1,164 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
deleted file mode 100644
index c7184f4..0000000
--- a/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue b/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
deleted file mode 100644
index 543d944..0000000
--- a/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
+++ /dev/null
@@ -1,137 +0,0 @@
-
-
报警推送配置
-
报警等级配置
-
报警内容配置
-
diff --git a/src/views/systemConfig/alarmContent/listContent.vue b/src/views/systemConfig/alarmContent/listContent.vue
index 0eb72bb..1b94ce3 100644
--- a/src/views/systemConfig/alarmContent/listContent.vue
+++ b/src/views/systemConfig/alarmContent/listContent.vue
@@ -74,7 +74,7 @@
import { getAlarmType } from '@/api/alarm/alarm'
export default {
- name: 'ListContent',
+ name: 'ListAlarmContent',
components: { editAlarmContent },
data() {
return {
diff --git a/src/views/systemConfig/responsibleUser/listResponsibleUser.vue b/src/views/systemConfig/responsibleUser/listResponsibleUser.vue
index d6b2a8b..0330806 100644
--- a/src/views/systemConfig/responsibleUser/listResponsibleUser.vue
+++ b/src/views/systemConfig/responsibleUser/listResponsibleUser.vue
@@ -62,7 +62,7 @@
},
computed: {
'showOperate': function() { // 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
- return this.hasPerm('/dept/update') || this.hasPerm('/dept/delete')
+ return this.hasPerm('/sys/dept/update') || this.hasPerm('/sys/dept/delete')
}
},
created() {
diff --git a/src/views/systemConfig/tenantConfig/tenantConfig.vue b/src/views/systemConfig/tenantConfig/tenantConfig.vue
index 898bf74..dcb4d6c 100644
--- a/src/views/systemConfig/tenantConfig/tenantConfig.vue
+++ b/src/views/systemConfig/tenantConfig/tenantConfig.vue
@@ -1,249 +1,251 @@
+
-
-
-
-
-
-
-
-
- 新增
-
-
-
-
-
-
- {{ scope.row[column.value] }}
-
- {{ scope.row[column.value] }}
-
-
-
-
-
-
- 编辑
-
-
- 详情
-
-
- 删除
-
-
-
-
-
-
-
- 数据列表
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 新增
-
-
-
-
-
-
- {{ scope.row[column.value] }}
-
- {{ scope.row[column.value] }}
-
-
-
-
-
-
- 编辑
-
-
- 详情
-
-
- 删除
-
-
-
-
-
-
-
- 数据列表
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/systemConfig/alarmConfig/components/alarmPushConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmPushConfig.vue
new file mode 100644
index 0000000..65e35a3
--- /dev/null
+++ b/src/views/systemConfig/alarmConfig/components/alarmPushConfig.vue
@@ -0,0 +1,144 @@
+
+
- 报警推送方式
-
-
- WEB端推送配置
-
-
- APP端推送配置
-
-
-
- 修改
-
-
- 保存
-
-
- 取消
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
index 93e9c8e..91b12b0 100644
--- a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
+++ b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
@@ -3,28 +3,28 @@
+ 报警推送方式
+
+
+ WEB端推送配置
+
+
+ APP端推送配置
+
+
+
+ 修改
+
+
+ 保存
+
+
+ 取消
+
+
+
-
-
-
+
+
-
+
-
-
-
-
-
-
-
-
+
+
+
+ WGS84
+
+
+ GCJ02
+
+
+ BD09
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
+
+
+
+ 保存
+
+
+ 取消
+
+
+
+
@@ -278,52 +279,9 @@
font-weight: 600;
}
.buttonGroup{
- margin: 20px;
- }
- .dept-div{
- padding-right: 12px;
- .box-card{
- width:100%;
- .user-dept-scroll{
- width:100%;
- height: calc(100vh - 200px);
- }
- .el-input{
- margin-bottom: 20px;
- }
+ margin-top: 20px;
+ .btn +.btn{
+ margin-left: 20px;
}
}
- $tableTitleHeight:46px;
- .table{
- margin-bottom: 20px;
- }
- .pagination-container{
- margin-bottom: 50px;
- }
- .table-title{
- background-color:rgba(243, 243, 243, 1);
- height: $tableTitleHeight;
- .title-header{
- line-height:$tableTitleHeight;
- color: #606266;
- font-size: 15px;
- i{
- margin-left: 5px;
- margin-right: 5px;
- }
- }
- }
- .edit_btns{
- .edit_btn{
- float:right;
- margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
- }
- }
-
-
diff --git a/src/views/systemConfig/viewsConfig/components/appConfig.vue b/src/views/systemConfig/viewsConfig/components/appConfig.vue
index cdc75c9..63084ba 100644
--- a/src/views/systemConfig/viewsConfig/components/appConfig.vue
+++ b/src/views/systemConfig/viewsConfig/components/appConfig.vue
@@ -1,152 +1,118 @@
+
+
+ 项目
+
+
-
{{ headerValue }}
+ {{ selectedTenant.tenantName }}
基础配置
NB平台配置
-
-
-
-
-
-
标题文字：
-
-
+
+
@@ -170,16 +136,40 @@
+
diff --git a/src/views/systemConfig/viewsConfig/components/pcConfig.vue b/src/views/systemConfig/viewsConfig/components/pcConfig.vue
index cdc75c9..82dae39 100644
--- a/src/views/systemConfig/viewsConfig/components/pcConfig.vue
+++ b/src/views/systemConfig/viewsConfig/components/pcConfig.vue
@@ -1,152 +1,155 @@
+ 标题
+
+
+
+
+
+
+ 系统Logo:
+
+
+
+
+
+
+
+
+ ![]()
-
-
- 修改
-
-
- 保存
-
-
- 取消
-
+
+
+
+
+
+ 标题文字:
+
+
+
+
+
+ 修改
+
+
+ 保存
+
+
+ 取消
+
+
+
+ 登录页
+
+
+
+
+
+ 登录页Logo:
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ ![]()
-
- 登录页文字：
-
-
-
-
- 修改
-
-
- 保存
-
-
- 取消
-
-
- 地图：
-
-
-
-
-
-
- 修改
-
-
- 保存
-
-
- 取消
-
-
-
- ![]()
-
-
- ![]()
-
-
- ![]()
-
-
+
+
+ 登录页文字:
+
+
+
+
+
+ 修改
+
+
+ 保存
+
+
+ 取消
+
+
+
-
-
-
-
-
-
标题文字：
-
-
-
+
+ 温度
+
+
+ 湿度
+
+
+
a.uptime < b.uptime ? -1 : 1)
this.list = data
this.chartData.rows = data
+ this.chartData2.rows = data
this.listLoading = false
}).catch(_ => this.listLoading = false)
},
diff --git a/src/views/deviceManage/components/listTempPressData.vue b/src/views/deviceManage/components/listTempPressData.vue
new file mode 100644
index 0000000..c41efa3
--- /dev/null
+++ b/src/views/deviceManage/components/listTempPressData.vue
@@ -0,0 +1,175 @@
+
+
+ {{ deviceForm.cell }}
+
+
{{ deviceForm.installHeight?deviceForm.installHeight+' m':'--' }}
@@ -56,10 +60,12 @@
import listHydrantData from './components/listHydrantData'
import listWellLocaData from './components/listWellLocaData'
import ListH2SData from './components/listH2SData'
+import SingleGasDetectorData from '@/views/deviceManage/components/listGasDetectorData'
export default {
name: 'EditDevice',
components: {
+ SingleGasDetectorData,
ListH2SData,
listDigData,
listGasData,
@@ -104,6 +110,7 @@
'11': 'list-hydrant-data',
'12': 'list-tube-data',
'14': 'list-h2-s-data'
+ // '101': 'single-gas-detector-data'
} // 组件对照表
}
},
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index d87cf41..1dbb51b 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -2,17 +2,29 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
@@ -49,8 +47,6 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
+
+
PC端
+ 浏览器页签
+
+
+
@@ -170,16 +173,40 @@
+
diff --git a/src/views/systemConfig/viewsConfig/viewsConfig.vue b/src/views/systemConfig/viewsConfig/viewsConfig.vue
index 8b86590..cfb1921 100644
--- a/src/views/systemConfig/viewsConfig/viewsConfig.vue
+++ b/src/views/systemConfig/viewsConfig/viewsConfig.vue
@@ -1,6 +1,6 @@
-
+
+
+
+ 页签Logo:
+
+
+
+
+
+
+
+
+ ![]()
-
-
- 修改
-
-
- 保存
-
-
- 取消
-
+
+
+
+ 标题
+
+
+
+
+
+
+ 系统Logo:
+
+
+
+
+
+
+
-
+
+ ![]()
-
- 登录页文字：
-
-
+
+
+
+ 标题文字:
+
+
+
+
+
+ 修改
+
+
+ 保存
+
+
+ 取消
+
+
+
+ 登录页
+
+
+
+
+
+ 登录页Logo:
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ ![]()
-
-
- 修改
-
-
- 保存
-
-
- 取消
-
-
-
- 地图：
-
-
-
-
-
-
- 修改
-
-
- 保存
-
-
- 取消
-
-
-
- ![]()
-
-
- ![]()
-
-
- ![]()
-
-
+
+
+ 登录页文字:
+
+
+
+
+
+ 修改
+
+
+ 保存
+
+
+ 取消
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/deviceManage/components/listHydrantData.vue b/src/views/deviceManage/components/listHydrantData.vue
index 8ba6cee..823201e 100644
--- a/src/views/deviceManage/components/listHydrantData.vue
+++ b/src/views/deviceManage/components/listHydrantData.vue
@@ -63,13 +63,13 @@
needIndex: false
}, // 是否需要序号列
columns: [
- { text: '上报时间', value: 'logTime', align: 'center' },
+ { text: '上报时间', value: 'logtime', align: 'center' },
{ text: '消防栓状态', value: 'descn', align: 'center' }
], // 显示列
headConfig: {
show: false
}, // 表格头配置
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listLiquidData.vue b/src/views/deviceManage/components/listLiquidData.vue
index 3b77db0..3bae830 100644
--- a/src/views/deviceManage/components/listLiquidData.vue
+++ b/src/views/deviceManage/components/listLiquidData.vue
@@ -69,7 +69,7 @@
{ text: '上报时间', value: 'uptime', align: 'center' },
{ text: '液位值', value: 'liquiddata', align: 'center' }
], // 显示列
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listNoiseData.vue b/src/views/deviceManage/components/listNoiseData.vue
index 1fb0f32..bc1024d 100644
--- a/src/views/deviceManage/components/listNoiseData.vue
+++ b/src/views/deviceManage/components/listNoiseData.vue
@@ -69,7 +69,7 @@
{ text: '上报时间', value: 'uptime', align: 'center' },
{ text: '噪声值', value: 'ddata', align: 'center' }
], // 显示列
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listTempData.vue b/src/views/deviceManage/components/listTempData.vue
index bf8136e..d2e6272 100644
--- a/src/views/deviceManage/components/listTempData.vue
+++ b/src/views/deviceManage/components/listTempData.vue
@@ -22,7 +22,15 @@
+
+
+ 设备数据情况
+
+
+
+
+
+
+
+
+
+ 温度
+
+
+ 湿度
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/deviceManage/components/listTubeData.vue b/src/views/deviceManage/components/listTubeData.vue
index 0bdd2bb..9cd3930 100644
--- a/src/views/deviceManage/components/listTubeData.vue
+++ b/src/views/deviceManage/components/listTubeData.vue
@@ -69,7 +69,7 @@
{ text: '上报时间', value: 'uptime', align: 'center' },
{ text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
], // 显示列
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listWellLocaData.vue b/src/views/deviceManage/components/listWellLocaData.vue
index 12aa64d..f1dc9de 100644
--- a/src/views/deviceManage/components/listWellLocaData.vue
+++ b/src/views/deviceManage/components/listWellLocaData.vue
@@ -70,7 +70,7 @@
headConfig: {
show: false
}, // 表格头配置
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listWellcoverData.vue b/src/views/deviceManage/components/listWellcoverData.vue
index a1d5ebc..5e3d69b 100644
--- a/src/views/deviceManage/components/listWellcoverData.vue
+++ b/src/views/deviceManage/components/listWellcoverData.vue
@@ -69,7 +69,7 @@
headConfig: {
show: false
}, // 表格头配置
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index f67d504..d51a8ce 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -20,6 +20,10 @@
{{ deviceForm.onlineStateName }}
+
+
+
+ 设备数据情况
+
+
+
+
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index 138af7a..94cbe3f 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.vue
@@ -138,11 +138,11 @@
value: 'devcode',
align: 'center'
},
- // {
- // text: '设备名称',
- // value: 'deviceName',
- // align: 'center'
- // },
+ {
+ text: '设备名称',
+ value: 'deviceName',
+ align: 'center'
+ },
{
text: '设备类型',
value: 'deviceTypeName',
diff --git a/src/views/overview/overview3dzq.vue b/src/views/overview/overview3dzq.vue
index 2297af0..988c5a8 100644
--- a/src/views/overview/overview3dzq.vue
+++ b/src/views/overview/overview3dzq.vue
@@ -35,7 +35,7 @@
import PopupDataFilter from '@/views/overview/components/popupDataFilter'
import PopupLocation from '@/views/overview/components/popupLocation'
import MapSearchComp from '@/views/overview/components/mapSearchComp'
-
+import { RSAencrypt } from '@/utils/security'
import axios from 'axios'
// import 'cesium/Source/Widgets/widgets.css'// 导入必须的样式表
// import 'cesium/Source/Cesium'// 导入必须的样式表
@@ -44,17 +44,17 @@
import 'mars3d/dist/mars3d.css'
import 'mars3d/dist/mars3d.js'
import * as mars3d from 'mars3d'
-import { RSAencrypt } from '@/utils/security'
let underground = null
-const layer2021 = null
+let layer2021 = null
+let layer2020 = null
let rqline_layer = null
let rqpoint_layer = null
let rqpoint3D_layer = null
let queryLineserver = null
let queryPointserver = null
export default {
- name: 'Overview3D',
+ name: 'Overview3dzq',
components: { MapSearchComp, PopupLocation, PopupDataFilter, ToolBox, AlarmList, AMapMarker, AMapContainer, DeptSelect },
data() {
return {
@@ -79,7 +79,7 @@
searchResultOffset: [-12, -30],
searchResultIcon: require('@/assets/overview/pure-position-icon.png'), // 报警图标
showAlarm: true, // 是否显示报警
- alpha: 100,
+ alpha: 80,
toolShow: false, // 工具栏是否显示
menus: {
menuList: [
@@ -116,7 +116,6 @@
tempMarker: null,
showClearBtn: false, // 是否显示清除查询按钮
bloomEffect: null,
- kaptcha: '',
loadToken: false
}
},
@@ -128,7 +127,9 @@
},
watch: {
alpha(val) {
- window.map.basemap.opacity = val / 100
+ window.viewer.imageryLayers._layers.forEach(layer => {
+ layer.alpha = val / 100 // 我们可以设置为0
+ })
underground.alpha = val / 100
if (val <= 90 && window.map.level >= 19) {
rqline_layer.show = false
@@ -166,7 +167,7 @@
},
beforeCreate: function() { // 从后台获取系统配置，根据配置判断是否加载验证码控件
this.$store.dispatch('GetConfig').then(() => {
- // this.$message.success('连接服务器成功')
+ this.$message.success('连接服务器成功')
this.handleLogin()
}).catch((e) => {
// this.$message.error('连接服务器失败')
@@ -178,7 +179,7 @@
const loginForm = {
sid: this.$store.getters.sid,
username: 'admin',
- password: RSAencrypt('111111')
+ password: RSAencrypt('1q2W3E4R')
}
this.$store.dispatch('Login', loginForm).then(() => {
// this.$message.success('登录成功')
@@ -204,6 +205,7 @@
tileMatrixLabels: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21']
})
var layer = window.viewer.imageryLayers.addImageryProvider(layerProvider)
+ layer.alpha = this.alpha / 100
// window.viewer.zoomTo(layer)
return layer
},
@@ -256,63 +258,85 @@
{ name: '注记', type: 'tdt', layer: 'ter_z', key: ['216ee92889e17ab1b083fae665d522b8'] },
{ name: '注记', type: 'tdt', layer: 'img_z', key: ['216ee92889e17ab1b083fae665d522b8'] }
]
- },
- {
- 'id': 1112,
- 'pid': 10,
- 'name': '天地图电子',
- 'icon': 'http://mars3d.cn/example/img/basemaps/tdt_vec.png',
- 'type': 'group',
- 'layers': [
- { 'name': '底图', 'type': 'tdt', 'layer': 'vec_d', 'key': ['216ee92889e17ab1b083fae665d522b8'] },
- { 'name': '注记', 'type': 'tdt', 'layer': 'vec_z', 'key': ['216ee92889e17ab1b083fae665d522b8'] }
- ]
- },
- {
- 'id': 1113,
- 'pid': 10,
- 'name': '天地图影像',
- 'icon': 'http://mars3d.cn/example/img/basemaps/tdt_img.png',
- 'type': 'tdt',
- 'layer': 'img_d',
- 'key': ['216ee92889e17ab1b083fae665d522b8'],
- 'show': true
}
+ // {
+ // 'id': 1112,
+ // 'pid': 10,
+ // 'name': '天地图电子',
+ // 'icon': 'http://mars3d.cn/example/img/basemaps/tdt_vec.png',
+ // 'type': 'group',
+ // 'layers': [
+ // { 'name': '底图', 'type': 'tdt', 'layer': 'vec_d', 'key': ['216ee92889e17ab1b083fae665d522b8'] },
+ // { 'name': '注记', 'type': 'tdt', 'layer': 'vec_z', 'key': ['216ee92889e17ab1b083fae665d522b8'] }
+ // ]
+ // },
+ // {
+ // 'id': 1113,
+ // 'pid': 10,
+ // 'name': '天地图影像',
+ // 'icon': 'http://mars3d.cn/example/img/basemaps/tdt_img.png',
+ // 'type': 'tdt',
+ // 'layer': 'img_d',
+ // 'key': ['216ee92889e17ab1b083fae665d522b8'],
+ // 'show': true
+ // }
]
}
Cesium.Ion.defaultAccessToken = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiI0N2E2M2ZmYi1iMDhjLTQwN2QtODZmOC0zNDZjNTMxYjgyNWEiLCJpZCI6MzY5MDMsImlhdCI6MTYwNzMzMTE2Nn0.5xsFCB0dxpcNGUkJOEpsVhUW9bf66XZIwV3hkZl09UI'
// 创建viewer实例
- // window.viewer = new Cesium.Viewer('mars3dContainer',
- // {
- // geocoder: false, // 是否显示地名查找控件
- // infoBox: false,
- // animation: false, // 是否显示动画控件(左下方那个)
- // timeline: false, // 是否显示时间线控件
- // shadows: false, // 阴影是否被太阳投射
- // showldAnimate: true, // 让场景中的动画自动播放
- // sceneModePicker: false, // 是否显示投影方式控件
- // fullscreenButton: false, // 全屏按钮不显示
- // homeButton: false,
- // navigationHelpButton: false, // 帮助按钮
- // baseLayerPicker: false,
- // imageryProvider: new Cesium.TileMapServiceImageryProvider({
- // url: Cesium.buildModuleUrl('Assets/Textures/NaturalEarthII')
- // })
- // })
+ window.viewer = new Cesium.Viewer('mars3dContainer', {
+ geocoder: false, // 是否显示地名查找控件
+ infoBox: false,
+ animation: false, // 是否显示动画控件(左下方那个)
+ timeline: false, // 是否显示时间线控件
+ shadows: false, // 阴影是否被太阳投射
+ showldAnimate: true, // 让场景中的动画自动播放
+ sceneModePicker: false, // 是否显示投影方式控件
+ fullscreenButton: false, // 全屏按钮不显示
+ homeButton: false,
+ navigationHelpButton: false, // 帮助按钮
+ baseLayerPicker: false,
+ imageryProvider: new Cesium.TileMapServiceImageryProvider({
+ url: Cesium.buildModuleUrl('Assets/Textures/NaturalEarthII')
+ })
+ })
// window.viewer.imageryLayers._layers[0].show = false
// window.viewer.scene.globe.baseColor = Cesium.Color.WHITE;
- // window.viewer._cesiumWidget._creditContainer.style.display = 'none' // 去除版权信息
+ window.viewer._cesiumWidget._creditContainer.style.display = 'none' // 去除版权信息
// mars3d.Map也可以直接传入外部已经构造好的viewer, 支持config.json所有参数
- const map = new mars3d.Map('mars3dContainer', mapOptions)
+ const map = new mars3d.Map(window.viewer, mapOptions)
- // const imgLayer = window.viewer.imageryLayers.addImageryProvider(layer)
+ const url2021 = 'http://172.20.90.108:8081/geoesb/proxy/5a44607b2e814658b463b76f9675bd3e/9bf164775ad94a18a5324f0eb681deea'
+ const url2020 = 'http://172.20.90.108:8081/geoesb/proxy/4fb75f7491c94356a9dd58a44d0dc57b/9bf164775ad94a18a5324f0eb681deea'
- // const map = new mars3d.Map('mars3dContainer', mapOptions)
- map.basemap = 1113
- // const url2021 = 'http://172.20.90.108:8081/geoesb/proxy/5a44607b2e814658b463b76f9675bd3e/9bf164775ad94a18a5324f0eb681deea'
- // const url2020 = 'http://172.20.90.108:8081/geoesb/proxy/4fb75f7491c94356a9dd58a44d0dc57b/9bf164775ad94a18a5324f0eb681deea'
- //
+ var layerProvider = new Cesium.WebMapTileServiceImageryProvider({
+ url: url2021 + '/Layers/default/Custom_Layers/{TileMatrix}/{TileRow}/{TileCol}.png',
+ layer: 'wzmap_map',
+ style: 'default',
+ tileMatrixSetID: 'default028mm',
+ format: 'image/png',
+ tilingScheme: new Cesium.GeographicTilingScheme(),
+ tileMatrixLabels: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21']
+ })
+ layer2021 = window.viewer.imageryLayers.addImageryProvider(layerProvider)
+ layer2021.alpha = this.alpha / 100
+
+ layerProvider = new Cesium.WebMapTileServiceImageryProvider({
+ url: url2020 + '?service=WMTS&request=GetTile&version=1.0.0&layer=JN2020DOM_05M&style=default&format=image/png&TileMatrixSet=CustomCRS4490ScaleJN2020DOM_05M&TileMatrix={TileMatrix}&TileRow={TileRow}&TileCol={TileCol}',
+ layer: 'wzmap_map',
+ style: 'default',
+ tileMatrixSetID: 'default028mm',
+ format: 'image/png',
+ tilingScheme: new Cesium.GeographicTilingScheme(),
+ tileMatrixLabels: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21']
+ })
+ layer2020 = window.viewer.imageryLayers.addImageryProvider(layerProvider)
+ layer2020.alpha = this.alpha / 100
+
+ layer2021.show = false
+
// layer2021 = this.SuperMap3DImageryProvider(url2021)
+ // layer2020 = this.SuperMap3DImageryProvider(url2020)
// map.scene.screenSpaceCameraController.enableCollisionDetection = false
// 设置鼠标
map.scene.screenSpaceCameraController.tiltEventTypes = [Cesium.CameraEventType.RIGHT_DRAG]
@@ -327,7 +351,7 @@
// enabled: true
// })
// map.addEffect(this.bloomEffect)
- window.map.basemap.opacity = this.alpha / 100
+ // window.map.basemap.opacity = this.alpha / 100
// 崩溃后刷新
map.on(mars3d.EventType.renderError, function(event) {
window.location.reload()
@@ -512,17 +536,22 @@
changeBaseMap(type) {
this.baseLayer = type
if (type === 'gaode_vec') {
- window.map.basemap = 1112
+ layer2021.show = true
+ layer2020.show = false
+ window.viewer.imageryLayers.raiseToTop(layer2021)
+ // window.map.basemap = 1112
// if (this.bloomEffect !== null) {
// this.bloomEffect.enabled = false
// }
} else {
- window.map.basemap = 1113
+ layer2021.show = false
+ layer2020.show = true
+ window.viewer.imageryLayers.raiseToTop(layer2020)
+ // window.map.basemap = 1113
// if (this.bloomEffect !== null) {
// this.bloomEffect.enabled = true
// }
}
- window.viewer.imageryLayers.raiseToTop(layer2021)
},
// 倒计时函数
countDown() {
@@ -756,7 +785,6 @@
// 获取当前报警列表
this.alarmListOri = response.data // 列表原始
this.alarmList = response.data // 要显示的报警列表
- this.alarmList = [{}, {}]
this.alarmWells = [] // 报警的井列表
for (const alarm of response.data) {
if (this.alarmWells.findIndex(item => item.wellCode === alarm.wellCode) == -1) {
@@ -951,6 +979,46 @@
margin-bottom: 0px;
}
}
+// 刷新框
+.function-div{
+ position: absolute;
+ right: 10px;
+ top: 7px;
+ z-index: 1100;
+ padding: 10px;
+ color: #ce8b74;
+ font-size: 14px;
+ /*background-color: rgba(244, 233, 230, 1.0);*/
+ .font-red{
+ color: red;
+ font-weight: bold;
+ }
+ .el-icon-refresh:hover{
+ color: red;
+ font-weight: bold;
+ cursor: pointer;
+ }
+}
+// 刷新框
+.refresh-div{
+ position: absolute;
+ right: 10px;
+ top: 7px;
+ z-index: 100;
+ padding: 10px;
+ color: #ce8b74;
+ font-size: 14px;
+ background-color: rgba(244, 233, 230, 1.0);
+ .font-red{
+ color: red;
+ font-weight: bold;
+ }
+ .el-icon-refresh:hover{
+ color: red;
+ font-weight: bold;
+ cursor: pointer;
+ }
+}
// 地图
.overview-map-container{
width: 100%;
@@ -980,11 +1048,11 @@
}
.cover{
position: absolute;
- bottom: 3px;
+ bottom: 0px;
left: 0px;
/*background-color: red;*/
- background-color: #000000;
+ background-color: #1a2126;
width: 100px;
- height: 25px;
+ height: 30px;
}
diff --git a/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue
deleted file mode 100644
index 8fbaa64..0000000
--- a/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue
+++ /dev/null
@@ -1,164 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
deleted file mode 100644
index c7184f4..0000000
--- a/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue b/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
deleted file mode 100644
index 543d944..0000000
--- a/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
+++ /dev/null
@@ -1,137 +0,0 @@
-
-
报警推送配置
-
报警等级配置
-
报警内容配置
-
diff --git a/src/views/systemConfig/alarmContent/listContent.vue b/src/views/systemConfig/alarmContent/listContent.vue
index 0eb72bb..1b94ce3 100644
--- a/src/views/systemConfig/alarmContent/listContent.vue
+++ b/src/views/systemConfig/alarmContent/listContent.vue
@@ -74,7 +74,7 @@
import { getAlarmType } from '@/api/alarm/alarm'
export default {
- name: 'ListContent',
+ name: 'ListAlarmContent',
components: { editAlarmContent },
data() {
return {
diff --git a/src/views/systemConfig/responsibleUser/listResponsibleUser.vue b/src/views/systemConfig/responsibleUser/listResponsibleUser.vue
index d6b2a8b..0330806 100644
--- a/src/views/systemConfig/responsibleUser/listResponsibleUser.vue
+++ b/src/views/systemConfig/responsibleUser/listResponsibleUser.vue
@@ -62,7 +62,7 @@
},
computed: {
'showOperate': function() { // 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
- return this.hasPerm('/dept/update') || this.hasPerm('/dept/delete')
+ return this.hasPerm('/sys/dept/update') || this.hasPerm('/sys/dept/delete')
}
},
created() {
diff --git a/src/views/systemConfig/tenantConfig/tenantConfig.vue b/src/views/systemConfig/tenantConfig/tenantConfig.vue
index 898bf74..dcb4d6c 100644
--- a/src/views/systemConfig/tenantConfig/tenantConfig.vue
+++ b/src/views/systemConfig/tenantConfig/tenantConfig.vue
@@ -1,249 +1,251 @@
+
-
-
-
-
-
-
-
-
- 新增
-
-
-
-
-
-
- {{ scope.row[column.value] }}
-
- {{ scope.row[column.value] }}
-
-
-
-
-
-
- 编辑
-
-
- 详情
-
-
- 删除
-
-
-
-
-
-
-
- 数据列表
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 新增
-
-
-
-
-
-
- {{ scope.row[column.value] }}
-
- {{ scope.row[column.value] }}
-
-
-
-
-
-
- 编辑
-
-
- 详情
-
-
- 删除
-
-
-
-
-
-
-
- 数据列表
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/systemConfig/alarmConfig/components/alarmPushConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmPushConfig.vue
new file mode 100644
index 0000000..65e35a3
--- /dev/null
+++ b/src/views/systemConfig/alarmConfig/components/alarmPushConfig.vue
@@ -0,0 +1,144 @@
+
+
- 报警推送方式
-
-
- WEB端推送配置
-
-
- APP端推送配置
-
-
-
- 修改
-
-
- 保存
-
-
- 取消
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
index 93e9c8e..91b12b0 100644
--- a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
+++ b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
@@ -3,28 +3,28 @@
+ 报警推送方式
+
+
+ WEB端推送配置
+
+
+ APP端推送配置
+
+
+
+ 修改
+
+
+ 保存
+
+
+ 取消
+
+
+
-
-
-
+
+
-
+
-
-
-
-
-
-
-
-
+
+
+
+ WGS84
+
+
+ GCJ02
+
+
+ BD09
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
+
+
+
+ 保存
+
+
+ 取消
+
+
+
+
@@ -278,52 +279,9 @@
font-weight: 600;
}
.buttonGroup{
- margin: 20px;
- }
- .dept-div{
- padding-right: 12px;
- .box-card{
- width:100%;
- .user-dept-scroll{
- width:100%;
- height: calc(100vh - 200px);
- }
- .el-input{
- margin-bottom: 20px;
- }
+ margin-top: 20px;
+ .btn +.btn{
+ margin-left: 20px;
}
}
- $tableTitleHeight:46px;
- .table{
- margin-bottom: 20px;
- }
- .pagination-container{
- margin-bottom: 50px;
- }
- .table-title{
- background-color:rgba(243, 243, 243, 1);
- height: $tableTitleHeight;
- .title-header{
- line-height:$tableTitleHeight;
- color: #606266;
- font-size: 15px;
- i{
- margin-left: 5px;
- margin-right: 5px;
- }
- }
- }
- .edit_btns{
- .edit_btn{
- float:right;
- margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
- }
- }
-
-
diff --git a/src/views/systemConfig/viewsConfig/components/appConfig.vue b/src/views/systemConfig/viewsConfig/components/appConfig.vue
index cdc75c9..63084ba 100644
--- a/src/views/systemConfig/viewsConfig/components/appConfig.vue
+++ b/src/views/systemConfig/viewsConfig/components/appConfig.vue
@@ -1,152 +1,118 @@
+
+
+ 项目
+
+
-
{{ headerValue }}
+ {{ selectedTenant.tenantName }}
基础配置
NB平台配置
-
-
-
-
-
-
标题文字：
-
-
+
+
@@ -170,16 +136,40 @@
+
diff --git a/src/views/systemConfig/viewsConfig/components/pcConfig.vue b/src/views/systemConfig/viewsConfig/components/pcConfig.vue
index cdc75c9..82dae39 100644
--- a/src/views/systemConfig/viewsConfig/components/pcConfig.vue
+++ b/src/views/systemConfig/viewsConfig/components/pcConfig.vue
@@ -1,152 +1,155 @@
+ 标题
+
+
+
+
+
+
+ 系统Logo:
+
+
+
+
+
+
+
+
+ ![]()
-
-
- 修改
-
-
- 保存
-
-
- 取消
-
+
+
+
+
+
+ 标题文字:
+
+
+
+
+
+ 修改
+
+
+ 保存
+
+
+ 取消
+
+
+
+ 登录页
+
+
+
+
+
+ 登录页Logo:
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ ![]()
-
- 登录页文字：
-
-
-
-
- 修改
-
-
- 保存
-
-
- 取消
-
-
- 地图：
-
-
-
-
-
-
- 修改
-
-
- 保存
-
-
- 取消
-
-
-
- ![]()
-
-
- ![]()
-
-
- ![]()
-
-
+
+
+ 登录页文字:
+
+
+
+
+
+ 修改
+
+
+ 保存
+
+
+ 取消
+
+
+
-
-
-
-
-
-
标题文字：
-
-
-
+
+ 温度
+
+
+ 湿度
+
+
+
a.uptime < b.uptime ? -1 : 1)
this.list = data
this.chartData.rows = data
+ this.chartData2.rows = data
this.listLoading = false
}).catch(_ => this.listLoading = false)
},
diff --git a/src/views/deviceManage/components/listTempPressData.vue b/src/views/deviceManage/components/listTempPressData.vue
new file mode 100644
index 0000000..c41efa3
--- /dev/null
+++ b/src/views/deviceManage/components/listTempPressData.vue
@@ -0,0 +1,175 @@
+
+
+ {{ deviceForm.cell }}
+
+
{{ deviceForm.installHeight?deviceForm.installHeight+' m':'--' }}
@@ -56,10 +60,12 @@
import listHydrantData from './components/listHydrantData'
import listWellLocaData from './components/listWellLocaData'
import ListH2SData from './components/listH2SData'
+import SingleGasDetectorData from '@/views/deviceManage/components/listGasDetectorData'
export default {
name: 'EditDevice',
components: {
+ SingleGasDetectorData,
ListH2SData,
listDigData,
listGasData,
@@ -104,6 +110,7 @@
'11': 'list-hydrant-data',
'12': 'list-tube-data',
'14': 'list-h2-s-data'
+ // '101': 'single-gas-detector-data'
} // 组件对照表
}
},
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index d87cf41..1dbb51b 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -2,17 +2,29 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
@@ -49,8 +47,6 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
+
+
PC端
+ 浏览器页签
+
+
+
@@ -170,16 +173,40 @@
+
diff --git a/src/views/systemConfig/viewsConfig/viewsConfig.vue b/src/views/systemConfig/viewsConfig/viewsConfig.vue
index 8b86590..cfb1921 100644
--- a/src/views/systemConfig/viewsConfig/viewsConfig.vue
+++ b/src/views/systemConfig/viewsConfig/viewsConfig.vue
@@ -1,6 +1,6 @@
-
+
+
+
+ 页签Logo:
+
+
+
+
+
+
+
+
+ ![]()
-
-
- 修改
-
-
- 保存
-
-
- 取消
-
+
+
+
+ 标题
+
+
+
+
+
+
+ 系统Logo:
+
+
+
+
+
+
+
-
+
+ ![]()
-
- 登录页文字：
-
-
+
+
+
+ 标题文字:
+
+
+
+
+
+ 修改
+
+
+ 保存
+
+
+ 取消
+
+
+
+ 登录页
+
+
+
+
+
+ 登录页Logo:
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ ![]()
-
-
- 修改
-
-
- 保存
-
-
- 取消
-
-
-
- 地图：
-
-
-
-
-
-
- 修改
-
-
- 保存
-
-
- 取消
-
-
-
- ![]()
-
-
- ![]()
-
-
- ![]()
-
-
+
+
+ 登录页文字:
+
+
+
+
+
+ 修改
+
+
+ 保存
+
+
+ 取消
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/deviceManage/components/listHydrantData.vue b/src/views/deviceManage/components/listHydrantData.vue
index 8ba6cee..823201e 100644
--- a/src/views/deviceManage/components/listHydrantData.vue
+++ b/src/views/deviceManage/components/listHydrantData.vue
@@ -63,13 +63,13 @@
needIndex: false
}, // 是否需要序号列
columns: [
- { text: '上报时间', value: 'logTime', align: 'center' },
+ { text: '上报时间', value: 'logtime', align: 'center' },
{ text: '消防栓状态', value: 'descn', align: 'center' }
], // 显示列
headConfig: {
show: false
}, // 表格头配置
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listLiquidData.vue b/src/views/deviceManage/components/listLiquidData.vue
index 3b77db0..3bae830 100644
--- a/src/views/deviceManage/components/listLiquidData.vue
+++ b/src/views/deviceManage/components/listLiquidData.vue
@@ -69,7 +69,7 @@
{ text: '上报时间', value: 'uptime', align: 'center' },
{ text: '液位值', value: 'liquiddata', align: 'center' }
], // 显示列
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listNoiseData.vue b/src/views/deviceManage/components/listNoiseData.vue
index 1fb0f32..bc1024d 100644
--- a/src/views/deviceManage/components/listNoiseData.vue
+++ b/src/views/deviceManage/components/listNoiseData.vue
@@ -69,7 +69,7 @@
{ text: '上报时间', value: 'uptime', align: 'center' },
{ text: '噪声值', value: 'ddata', align: 'center' }
], // 显示列
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listTempData.vue b/src/views/deviceManage/components/listTempData.vue
index bf8136e..d2e6272 100644
--- a/src/views/deviceManage/components/listTempData.vue
+++ b/src/views/deviceManage/components/listTempData.vue
@@ -22,7 +22,15 @@
+
+
+ 设备数据情况
+
+
+
+
+
+
+
+
+
+ 温度
+
+
+ 湿度
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/deviceManage/components/listTubeData.vue b/src/views/deviceManage/components/listTubeData.vue
index 0bdd2bb..9cd3930 100644
--- a/src/views/deviceManage/components/listTubeData.vue
+++ b/src/views/deviceManage/components/listTubeData.vue
@@ -69,7 +69,7 @@
{ text: '上报时间', value: 'uptime', align: 'center' },
{ text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
], // 显示列
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listWellLocaData.vue b/src/views/deviceManage/components/listWellLocaData.vue
index 12aa64d..f1dc9de 100644
--- a/src/views/deviceManage/components/listWellLocaData.vue
+++ b/src/views/deviceManage/components/listWellLocaData.vue
@@ -70,7 +70,7 @@
headConfig: {
show: false
}, // 表格头配置
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listWellcoverData.vue b/src/views/deviceManage/components/listWellcoverData.vue
index a1d5ebc..5e3d69b 100644
--- a/src/views/deviceManage/components/listWellcoverData.vue
+++ b/src/views/deviceManage/components/listWellcoverData.vue
@@ -69,7 +69,7 @@
headConfig: {
show: false
}, // 表格头配置
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index f67d504..d51a8ce 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -20,6 +20,10 @@
{{ deviceForm.onlineStateName }}
+
+
+
+ 设备数据情况
+
+
+
+
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index 138af7a..94cbe3f 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.vue
@@ -138,11 +138,11 @@
value: 'devcode',
align: 'center'
},
- // {
- // text: '设备名称',
- // value: 'deviceName',
- // align: 'center'
- // },
+ {
+ text: '设备名称',
+ value: 'deviceName',
+ align: 'center'
+ },
{
text: '设备类型',
value: 'deviceTypeName',
diff --git a/src/views/overview/overview3dzq.vue b/src/views/overview/overview3dzq.vue
index 2297af0..988c5a8 100644
--- a/src/views/overview/overview3dzq.vue
+++ b/src/views/overview/overview3dzq.vue
@@ -35,7 +35,7 @@
import PopupDataFilter from '@/views/overview/components/popupDataFilter'
import PopupLocation from '@/views/overview/components/popupLocation'
import MapSearchComp from '@/views/overview/components/mapSearchComp'
-
+import { RSAencrypt } from '@/utils/security'
import axios from 'axios'
// import 'cesium/Source/Widgets/widgets.css'// 导入必须的样式表
// import 'cesium/Source/Cesium'// 导入必须的样式表
@@ -44,17 +44,17 @@
import 'mars3d/dist/mars3d.css'
import 'mars3d/dist/mars3d.js'
import * as mars3d from 'mars3d'
-import { RSAencrypt } from '@/utils/security'
let underground = null
-const layer2021 = null
+let layer2021 = null
+let layer2020 = null
let rqline_layer = null
let rqpoint_layer = null
let rqpoint3D_layer = null
let queryLineserver = null
let queryPointserver = null
export default {
- name: 'Overview3D',
+ name: 'Overview3dzq',
components: { MapSearchComp, PopupLocation, PopupDataFilter, ToolBox, AlarmList, AMapMarker, AMapContainer, DeptSelect },
data() {
return {
@@ -79,7 +79,7 @@
searchResultOffset: [-12, -30],
searchResultIcon: require('@/assets/overview/pure-position-icon.png'), // 报警图标
showAlarm: true, // 是否显示报警
- alpha: 100,
+ alpha: 80,
toolShow: false, // 工具栏是否显示
menus: {
menuList: [
@@ -116,7 +116,6 @@
tempMarker: null,
showClearBtn: false, // 是否显示清除查询按钮
bloomEffect: null,
- kaptcha: '',
loadToken: false
}
},
@@ -128,7 +127,9 @@
},
watch: {
alpha(val) {
- window.map.basemap.opacity = val / 100
+ window.viewer.imageryLayers._layers.forEach(layer => {
+ layer.alpha = val / 100 // 我们可以设置为0
+ })
underground.alpha = val / 100
if (val <= 90 && window.map.level >= 19) {
rqline_layer.show = false
@@ -166,7 +167,7 @@
},
beforeCreate: function() { // 从后台获取系统配置，根据配置判断是否加载验证码控件
this.$store.dispatch('GetConfig').then(() => {
- // this.$message.success('连接服务器成功')
+ this.$message.success('连接服务器成功')
this.handleLogin()
}).catch((e) => {
// this.$message.error('连接服务器失败')
@@ -178,7 +179,7 @@
const loginForm = {
sid: this.$store.getters.sid,
username: 'admin',
- password: RSAencrypt('111111')
+ password: RSAencrypt('1q2W3E4R')
}
this.$store.dispatch('Login', loginForm).then(() => {
// this.$message.success('登录成功')
@@ -204,6 +205,7 @@
tileMatrixLabels: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21']
})
var layer = window.viewer.imageryLayers.addImageryProvider(layerProvider)
+ layer.alpha = this.alpha / 100
// window.viewer.zoomTo(layer)
return layer
},
@@ -256,63 +258,85 @@
{ name: '注记', type: 'tdt', layer: 'ter_z', key: ['216ee92889e17ab1b083fae665d522b8'] },
{ name: '注记', type: 'tdt', layer: 'img_z', key: ['216ee92889e17ab1b083fae665d522b8'] }
]
- },
- {
- 'id': 1112,
- 'pid': 10,
- 'name': '天地图电子',
- 'icon': 'http://mars3d.cn/example/img/basemaps/tdt_vec.png',
- 'type': 'group',
- 'layers': [
- { 'name': '底图', 'type': 'tdt', 'layer': 'vec_d', 'key': ['216ee92889e17ab1b083fae665d522b8'] },
- { 'name': '注记', 'type': 'tdt', 'layer': 'vec_z', 'key': ['216ee92889e17ab1b083fae665d522b8'] }
- ]
- },
- {
- 'id': 1113,
- 'pid': 10,
- 'name': '天地图影像',
- 'icon': 'http://mars3d.cn/example/img/basemaps/tdt_img.png',
- 'type': 'tdt',
- 'layer': 'img_d',
- 'key': ['216ee92889e17ab1b083fae665d522b8'],
- 'show': true
}
+ // {
+ // 'id': 1112,
+ // 'pid': 10,
+ // 'name': '天地图电子',
+ // 'icon': 'http://mars3d.cn/example/img/basemaps/tdt_vec.png',
+ // 'type': 'group',
+ // 'layers': [
+ // { 'name': '底图', 'type': 'tdt', 'layer': 'vec_d', 'key': ['216ee92889e17ab1b083fae665d522b8'] },
+ // { 'name': '注记', 'type': 'tdt', 'layer': 'vec_z', 'key': ['216ee92889e17ab1b083fae665d522b8'] }
+ // ]
+ // },
+ // {
+ // 'id': 1113,
+ // 'pid': 10,
+ // 'name': '天地图影像',
+ // 'icon': 'http://mars3d.cn/example/img/basemaps/tdt_img.png',
+ // 'type': 'tdt',
+ // 'layer': 'img_d',
+ // 'key': ['216ee92889e17ab1b083fae665d522b8'],
+ // 'show': true
+ // }
]
}
Cesium.Ion.defaultAccessToken = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiI0N2E2M2ZmYi1iMDhjLTQwN2QtODZmOC0zNDZjNTMxYjgyNWEiLCJpZCI6MzY5MDMsImlhdCI6MTYwNzMzMTE2Nn0.5xsFCB0dxpcNGUkJOEpsVhUW9bf66XZIwV3hkZl09UI'
// 创建viewer实例
- // window.viewer = new Cesium.Viewer('mars3dContainer',
- // {
- // geocoder: false, // 是否显示地名查找控件
- // infoBox: false,
- // animation: false, // 是否显示动画控件(左下方那个)
- // timeline: false, // 是否显示时间线控件
- // shadows: false, // 阴影是否被太阳投射
- // showldAnimate: true, // 让场景中的动画自动播放
- // sceneModePicker: false, // 是否显示投影方式控件
- // fullscreenButton: false, // 全屏按钮不显示
- // homeButton: false,
- // navigationHelpButton: false, // 帮助按钮
- // baseLayerPicker: false,
- // imageryProvider: new Cesium.TileMapServiceImageryProvider({
- // url: Cesium.buildModuleUrl('Assets/Textures/NaturalEarthII')
- // })
- // })
+ window.viewer = new Cesium.Viewer('mars3dContainer', {
+ geocoder: false, // 是否显示地名查找控件
+ infoBox: false,
+ animation: false, // 是否显示动画控件(左下方那个)
+ timeline: false, // 是否显示时间线控件
+ shadows: false, // 阴影是否被太阳投射
+ showldAnimate: true, // 让场景中的动画自动播放
+ sceneModePicker: false, // 是否显示投影方式控件
+ fullscreenButton: false, // 全屏按钮不显示
+ homeButton: false,
+ navigationHelpButton: false, // 帮助按钮
+ baseLayerPicker: false,
+ imageryProvider: new Cesium.TileMapServiceImageryProvider({
+ url: Cesium.buildModuleUrl('Assets/Textures/NaturalEarthII')
+ })
+ })
// window.viewer.imageryLayers._layers[0].show = false
// window.viewer.scene.globe.baseColor = Cesium.Color.WHITE;
- // window.viewer._cesiumWidget._creditContainer.style.display = 'none' // 去除版权信息
+ window.viewer._cesiumWidget._creditContainer.style.display = 'none' // 去除版权信息
// mars3d.Map也可以直接传入外部已经构造好的viewer, 支持config.json所有参数
- const map = new mars3d.Map('mars3dContainer', mapOptions)
+ const map = new mars3d.Map(window.viewer, mapOptions)
- // const imgLayer = window.viewer.imageryLayers.addImageryProvider(layer)
+ const url2021 = 'http://172.20.90.108:8081/geoesb/proxy/5a44607b2e814658b463b76f9675bd3e/9bf164775ad94a18a5324f0eb681deea'
+ const url2020 = 'http://172.20.90.108:8081/geoesb/proxy/4fb75f7491c94356a9dd58a44d0dc57b/9bf164775ad94a18a5324f0eb681deea'
- // const map = new mars3d.Map('mars3dContainer', mapOptions)
- map.basemap = 1113
- // const url2021 = 'http://172.20.90.108:8081/geoesb/proxy/5a44607b2e814658b463b76f9675bd3e/9bf164775ad94a18a5324f0eb681deea'
- // const url2020 = 'http://172.20.90.108:8081/geoesb/proxy/4fb75f7491c94356a9dd58a44d0dc57b/9bf164775ad94a18a5324f0eb681deea'
- //
+ var layerProvider = new Cesium.WebMapTileServiceImageryProvider({
+ url: url2021 + '/Layers/default/Custom_Layers/{TileMatrix}/{TileRow}/{TileCol}.png',
+ layer: 'wzmap_map',
+ style: 'default',
+ tileMatrixSetID: 'default028mm',
+ format: 'image/png',
+ tilingScheme: new Cesium.GeographicTilingScheme(),
+ tileMatrixLabels: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21']
+ })
+ layer2021 = window.viewer.imageryLayers.addImageryProvider(layerProvider)
+ layer2021.alpha = this.alpha / 100
+
+ layerProvider = new Cesium.WebMapTileServiceImageryProvider({
+ url: url2020 + '?service=WMTS&request=GetTile&version=1.0.0&layer=JN2020DOM_05M&style=default&format=image/png&TileMatrixSet=CustomCRS4490ScaleJN2020DOM_05M&TileMatrix={TileMatrix}&TileRow={TileRow}&TileCol={TileCol}',
+ layer: 'wzmap_map',
+ style: 'default',
+ tileMatrixSetID: 'default028mm',
+ format: 'image/png',
+ tilingScheme: new Cesium.GeographicTilingScheme(),
+ tileMatrixLabels: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21']
+ })
+ layer2020 = window.viewer.imageryLayers.addImageryProvider(layerProvider)
+ layer2020.alpha = this.alpha / 100
+
+ layer2021.show = false
+
// layer2021 = this.SuperMap3DImageryProvider(url2021)
+ // layer2020 = this.SuperMap3DImageryProvider(url2020)
// map.scene.screenSpaceCameraController.enableCollisionDetection = false
// 设置鼠标
map.scene.screenSpaceCameraController.tiltEventTypes = [Cesium.CameraEventType.RIGHT_DRAG]
@@ -327,7 +351,7 @@
// enabled: true
// })
// map.addEffect(this.bloomEffect)
- window.map.basemap.opacity = this.alpha / 100
+ // window.map.basemap.opacity = this.alpha / 100
// 崩溃后刷新
map.on(mars3d.EventType.renderError, function(event) {
window.location.reload()
@@ -512,17 +536,22 @@
changeBaseMap(type) {
this.baseLayer = type
if (type === 'gaode_vec') {
- window.map.basemap = 1112
+ layer2021.show = true
+ layer2020.show = false
+ window.viewer.imageryLayers.raiseToTop(layer2021)
+ // window.map.basemap = 1112
// if (this.bloomEffect !== null) {
// this.bloomEffect.enabled = false
// }
} else {
- window.map.basemap = 1113
+ layer2021.show = false
+ layer2020.show = true
+ window.viewer.imageryLayers.raiseToTop(layer2020)
+ // window.map.basemap = 1113
// if (this.bloomEffect !== null) {
// this.bloomEffect.enabled = true
// }
}
- window.viewer.imageryLayers.raiseToTop(layer2021)
},
// 倒计时函数
countDown() {
@@ -756,7 +785,6 @@
// 获取当前报警列表
this.alarmListOri = response.data // 列表原始
this.alarmList = response.data // 要显示的报警列表
- this.alarmList = [{}, {}]
this.alarmWells = [] // 报警的井列表
for (const alarm of response.data) {
if (this.alarmWells.findIndex(item => item.wellCode === alarm.wellCode) == -1) {
@@ -951,6 +979,46 @@
margin-bottom: 0px;
}
}
+// 刷新框
+.function-div{
+ position: absolute;
+ right: 10px;
+ top: 7px;
+ z-index: 1100;
+ padding: 10px;
+ color: #ce8b74;
+ font-size: 14px;
+ /*background-color: rgba(244, 233, 230, 1.0);*/
+ .font-red{
+ color: red;
+ font-weight: bold;
+ }
+ .el-icon-refresh:hover{
+ color: red;
+ font-weight: bold;
+ cursor: pointer;
+ }
+}
+// 刷新框
+.refresh-div{
+ position: absolute;
+ right: 10px;
+ top: 7px;
+ z-index: 100;
+ padding: 10px;
+ color: #ce8b74;
+ font-size: 14px;
+ background-color: rgba(244, 233, 230, 1.0);
+ .font-red{
+ color: red;
+ font-weight: bold;
+ }
+ .el-icon-refresh:hover{
+ color: red;
+ font-weight: bold;
+ cursor: pointer;
+ }
+}
// 地图
.overview-map-container{
width: 100%;
@@ -980,11 +1048,11 @@
}
.cover{
position: absolute;
- bottom: 3px;
+ bottom: 0px;
left: 0px;
/*background-color: red;*/
- background-color: #000000;
+ background-color: #1a2126;
width: 100px;
- height: 25px;
+ height: 30px;
}
diff --git a/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue
deleted file mode 100644
index 8fbaa64..0000000
--- a/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue
+++ /dev/null
@@ -1,164 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
deleted file mode 100644
index c7184f4..0000000
--- a/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue b/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
deleted file mode 100644
index 543d944..0000000
--- a/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
+++ /dev/null
@@ -1,137 +0,0 @@
-
-
报警推送配置
-
报警等级配置
-
报警内容配置
-
diff --git a/src/views/systemConfig/alarmContent/listContent.vue b/src/views/systemConfig/alarmContent/listContent.vue
index 0eb72bb..1b94ce3 100644
--- a/src/views/systemConfig/alarmContent/listContent.vue
+++ b/src/views/systemConfig/alarmContent/listContent.vue
@@ -74,7 +74,7 @@
import { getAlarmType } from '@/api/alarm/alarm'
export default {
- name: 'ListContent',
+ name: 'ListAlarmContent',
components: { editAlarmContent },
data() {
return {
diff --git a/src/views/systemConfig/responsibleUser/listResponsibleUser.vue b/src/views/systemConfig/responsibleUser/listResponsibleUser.vue
index d6b2a8b..0330806 100644
--- a/src/views/systemConfig/responsibleUser/listResponsibleUser.vue
+++ b/src/views/systemConfig/responsibleUser/listResponsibleUser.vue
@@ -62,7 +62,7 @@
},
computed: {
'showOperate': function() { // 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
- return this.hasPerm('/dept/update') || this.hasPerm('/dept/delete')
+ return this.hasPerm('/sys/dept/update') || this.hasPerm('/sys/dept/delete')
}
},
created() {
diff --git a/src/views/systemConfig/tenantConfig/tenantConfig.vue b/src/views/systemConfig/tenantConfig/tenantConfig.vue
index 898bf74..dcb4d6c 100644
--- a/src/views/systemConfig/tenantConfig/tenantConfig.vue
+++ b/src/views/systemConfig/tenantConfig/tenantConfig.vue
@@ -1,249 +1,251 @@
+
-
-
-
-
-
-
-
-
- 新增
-
-
-
-
-
-
- {{ scope.row[column.value] }}
-
- {{ scope.row[column.value] }}
-
-
-
-
-
-
- 编辑
-
-
- 详情
-
-
- 删除
-
-
-
-
-
-
-
- 数据列表
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 新增
-
-
-
-
-
-
- {{ scope.row[column.value] }}
-
- {{ scope.row[column.value] }}
-
-
-
-
-
-
- 编辑
-
-
- 详情
-
-
- 删除
-
-
-
-
-
-
-
- 数据列表
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/systemConfig/alarmConfig/components/alarmPushConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmPushConfig.vue
new file mode 100644
index 0000000..65e35a3
--- /dev/null
+++ b/src/views/systemConfig/alarmConfig/components/alarmPushConfig.vue
@@ -0,0 +1,144 @@
+
+
- 报警推送方式
-
-
- WEB端推送配置
-
-
- APP端推送配置
-
-
-
- 修改
-
-
- 保存
-
-
- 取消
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
index 93e9c8e..91b12b0 100644
--- a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
+++ b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
@@ -3,28 +3,28 @@
+ 报警推送方式
+
+
+ WEB端推送配置
+
+
+ APP端推送配置
+
+
+
+ 修改
+
+
+ 保存
+
+
+ 取消
+
+
+
-
-
-
+
+
-
+
-
-
-
-
-
-
-
-
+
+
+
+ WGS84
+
+
+ GCJ02
+
+
+ BD09
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
+
+
+
+ 保存
+
+
+ 取消
+
+
+
+
@@ -278,52 +279,9 @@
font-weight: 600;
}
.buttonGroup{
- margin: 20px;
- }
- .dept-div{
- padding-right: 12px;
- .box-card{
- width:100%;
- .user-dept-scroll{
- width:100%;
- height: calc(100vh - 200px);
- }
- .el-input{
- margin-bottom: 20px;
- }
+ margin-top: 20px;
+ .btn +.btn{
+ margin-left: 20px;
}
}
- $tableTitleHeight:46px;
- .table{
- margin-bottom: 20px;
- }
- .pagination-container{
- margin-bottom: 50px;
- }
- .table-title{
- background-color:rgba(243, 243, 243, 1);
- height: $tableTitleHeight;
- .title-header{
- line-height:$tableTitleHeight;
- color: #606266;
- font-size: 15px;
- i{
- margin-left: 5px;
- margin-right: 5px;
- }
- }
- }
- .edit_btns{
- .edit_btn{
- float:right;
- margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
- }
- }
-
-
diff --git a/src/views/systemConfig/viewsConfig/components/appConfig.vue b/src/views/systemConfig/viewsConfig/components/appConfig.vue
index cdc75c9..63084ba 100644
--- a/src/views/systemConfig/viewsConfig/components/appConfig.vue
+++ b/src/views/systemConfig/viewsConfig/components/appConfig.vue
@@ -1,152 +1,118 @@
+
+
+ 项目
+
+
-
{{ headerValue }}
+ {{ selectedTenant.tenantName }}
基础配置
NB平台配置
-
-
-
-
-
-
标题文字：
-
-
+
+
@@ -170,16 +136,40 @@
+
diff --git a/src/views/systemConfig/viewsConfig/components/pcConfig.vue b/src/views/systemConfig/viewsConfig/components/pcConfig.vue
index cdc75c9..82dae39 100644
--- a/src/views/systemConfig/viewsConfig/components/pcConfig.vue
+++ b/src/views/systemConfig/viewsConfig/components/pcConfig.vue
@@ -1,152 +1,155 @@
+ 标题
+
+
+
+
+
+
+ 系统Logo:
+
+
+
+
+
+
+
+
+ ![]()
-
-
- 修改
-
-
- 保存
-
-
- 取消
-
+
+
+
+
+
+ 标题文字:
+
+
+
+
+
+ 修改
+
+
+ 保存
+
+
+ 取消
+
+
+
+ 登录页
+
+
+
+
+
+ 登录页Logo:
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ ![]()
-
- 登录页文字：
-
-
-
-
- 修改
-
-
- 保存
-
-
- 取消
-
-
- 地图：
-
-
-
-
-
-
- 修改
-
-
- 保存
-
-
- 取消
-
-
-
- ![]()
-
-
- ![]()
-
-
- ![]()
-
-
+
+
+ 登录页文字:
+
+
+
+
+
+ 修改
+
+
+ 保存
+
+
+ 取消
+
+
+
-
-
-
-
-
-
标题文字：
-
-
+
+
-
+
+
PC端
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 区/县
-
-
-
-
-
-
- 街道/镇
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ {{ config.label }}
+
+
+ {{ wellForm[config.value]?wellForm[config.value]:config.placeholder }}
+
+
+ {{ areaName }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/deviceManage/components/listHydrantData.vue b/src/views/deviceManage/components/listHydrantData.vue
index 8ba6cee..823201e 100644
--- a/src/views/deviceManage/components/listHydrantData.vue
+++ b/src/views/deviceManage/components/listHydrantData.vue
@@ -63,13 +63,13 @@
needIndex: false
}, // 是否需要序号列
columns: [
- { text: '上报时间', value: 'logTime', align: 'center' },
+ { text: '上报时间', value: 'logtime', align: 'center' },
{ text: '消防栓状态', value: 'descn', align: 'center' }
], // 显示列
headConfig: {
show: false
}, // 表格头配置
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listLiquidData.vue b/src/views/deviceManage/components/listLiquidData.vue
index 3b77db0..3bae830 100644
--- a/src/views/deviceManage/components/listLiquidData.vue
+++ b/src/views/deviceManage/components/listLiquidData.vue
@@ -69,7 +69,7 @@
{ text: '上报时间', value: 'uptime', align: 'center' },
{ text: '液位值', value: 'liquiddata', align: 'center' }
], // 显示列
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listNoiseData.vue b/src/views/deviceManage/components/listNoiseData.vue
index 1fb0f32..bc1024d 100644
--- a/src/views/deviceManage/components/listNoiseData.vue
+++ b/src/views/deviceManage/components/listNoiseData.vue
@@ -69,7 +69,7 @@
{ text: '上报时间', value: 'uptime', align: 'center' },
{ text: '噪声值', value: 'ddata', align: 'center' }
], // 显示列
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listTempData.vue b/src/views/deviceManage/components/listTempData.vue
index bf8136e..d2e6272 100644
--- a/src/views/deviceManage/components/listTempData.vue
+++ b/src/views/deviceManage/components/listTempData.vue
@@ -22,7 +22,15 @@
-
+
+ 温度
+
+
+ 湿度
+
+
+
a.uptime < b.uptime ? -1 : 1)
this.list = data
this.chartData.rows = data
+ this.chartData2.rows = data
this.listLoading = false
}).catch(_ => this.listLoading = false)
},
diff --git a/src/views/deviceManage/components/listTempPressData.vue b/src/views/deviceManage/components/listTempPressData.vue
new file mode 100644
index 0000000..c41efa3
--- /dev/null
+++ b/src/views/deviceManage/components/listTempPressData.vue
@@ -0,0 +1,175 @@
+
+
+ {{ deviceForm.cell }}
+
+
{{ deviceForm.installHeight?deviceForm.installHeight+' m':'--' }}
@@ -56,10 +60,12 @@
import listHydrantData from './components/listHydrantData'
import listWellLocaData from './components/listWellLocaData'
import ListH2SData from './components/listH2SData'
+import SingleGasDetectorData from '@/views/deviceManage/components/listGasDetectorData'
export default {
name: 'EditDevice',
components: {
+ SingleGasDetectorData,
ListH2SData,
listDigData,
listGasData,
@@ -104,6 +110,7 @@
'11': 'list-hydrant-data',
'12': 'list-tube-data',
'14': 'list-h2-s-data'
+ // '101': 'single-gas-detector-data'
} // 组件对照表
}
},
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index d87cf41..1dbb51b 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -2,17 +2,29 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
@@ -49,8 +47,6 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+ 浏览器页签
+
+
+
@@ -170,16 +173,40 @@
+
diff --git a/src/views/systemConfig/viewsConfig/viewsConfig.vue b/src/views/systemConfig/viewsConfig/viewsConfig.vue
index 8b86590..cfb1921 100644
--- a/src/views/systemConfig/viewsConfig/viewsConfig.vue
+++ b/src/views/systemConfig/viewsConfig/viewsConfig.vue
@@ -1,6 +1,6 @@
-
+
+
+
+ 页签Logo:
+
+
+
+
+
+
+
+
+ ![]()
-
-
- 修改
-
-
- 保存
-
-
- 取消
-
+
+
+
+ 标题
+
+
+
+
+
+
+ 系统Logo:
+
+
+
+
+
+
+
-
+
+ ![]()
-
- 登录页文字：
-
-
+
+
+
+ 标题文字:
+
+
+
+
+
+ 修改
+
+
+ 保存
+
+
+ 取消
+
+
+
+ 登录页
+
+
+
+
+
+ 登录页Logo:
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ ![]()
-
-
- 修改
-
-
- 保存
-
-
- 取消
-
-
-
- 地图：
-
-
-
-
-
-
- 修改
-
-
- 保存
-
-
- 取消
-
-
-
- ![]()
-
-
- ![]()
-
-
- ![]()
-
-
+
+
+ 登录页文字:
+
+
+
+
+
+ 修改
+
+
+ 保存
+
+
+ 取消
+
+
+
+
+
+
+
+
+ 温度
+
+
+ 湿度
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/deviceManage/components/listTubeData.vue b/src/views/deviceManage/components/listTubeData.vue
index 0bdd2bb..9cd3930 100644
--- a/src/views/deviceManage/components/listTubeData.vue
+++ b/src/views/deviceManage/components/listTubeData.vue
@@ -69,7 +69,7 @@
{ text: '上报时间', value: 'uptime', align: 'center' },
{ text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
], // 显示列
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listWellLocaData.vue b/src/views/deviceManage/components/listWellLocaData.vue
index 12aa64d..f1dc9de 100644
--- a/src/views/deviceManage/components/listWellLocaData.vue
+++ b/src/views/deviceManage/components/listWellLocaData.vue
@@ -70,7 +70,7 @@
headConfig: {
show: false
}, // 表格头配置
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listWellcoverData.vue b/src/views/deviceManage/components/listWellcoverData.vue
index a1d5ebc..5e3d69b 100644
--- a/src/views/deviceManage/components/listWellcoverData.vue
+++ b/src/views/deviceManage/components/listWellcoverData.vue
@@ -69,7 +69,7 @@
headConfig: {
show: false
}, // 表格头配置
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index f67d504..d51a8ce 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -20,6 +20,10 @@
{{ deviceForm.onlineStateName }}
+
+
+
+ 设备数据情况
+
+
+
+
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index 138af7a..94cbe3f 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.vue
@@ -138,11 +138,11 @@
value: 'devcode',
align: 'center'
},
- // {
- // text: '设备名称',
- // value: 'deviceName',
- // align: 'center'
- // },
+ {
+ text: '设备名称',
+ value: 'deviceName',
+ align: 'center'
+ },
{
text: '设备类型',
value: 'deviceTypeName',
diff --git a/src/views/overview/overview3dzq.vue b/src/views/overview/overview3dzq.vue
index 2297af0..988c5a8 100644
--- a/src/views/overview/overview3dzq.vue
+++ b/src/views/overview/overview3dzq.vue
@@ -35,7 +35,7 @@
import PopupDataFilter from '@/views/overview/components/popupDataFilter'
import PopupLocation from '@/views/overview/components/popupLocation'
import MapSearchComp from '@/views/overview/components/mapSearchComp'
-
+import { RSAencrypt } from '@/utils/security'
import axios from 'axios'
// import 'cesium/Source/Widgets/widgets.css'// 导入必须的样式表
// import 'cesium/Source/Cesium'// 导入必须的样式表
@@ -44,17 +44,17 @@
import 'mars3d/dist/mars3d.css'
import 'mars3d/dist/mars3d.js'
import * as mars3d from 'mars3d'
-import { RSAencrypt } from '@/utils/security'
let underground = null
-const layer2021 = null
+let layer2021 = null
+let layer2020 = null
let rqline_layer = null
let rqpoint_layer = null
let rqpoint3D_layer = null
let queryLineserver = null
let queryPointserver = null
export default {
- name: 'Overview3D',
+ name: 'Overview3dzq',
components: { MapSearchComp, PopupLocation, PopupDataFilter, ToolBox, AlarmList, AMapMarker, AMapContainer, DeptSelect },
data() {
return {
@@ -79,7 +79,7 @@
searchResultOffset: [-12, -30],
searchResultIcon: require('@/assets/overview/pure-position-icon.png'), // 报警图标
showAlarm: true, // 是否显示报警
- alpha: 100,
+ alpha: 80,
toolShow: false, // 工具栏是否显示
menus: {
menuList: [
@@ -116,7 +116,6 @@
tempMarker: null,
showClearBtn: false, // 是否显示清除查询按钮
bloomEffect: null,
- kaptcha: '',
loadToken: false
}
},
@@ -128,7 +127,9 @@
},
watch: {
alpha(val) {
- window.map.basemap.opacity = val / 100
+ window.viewer.imageryLayers._layers.forEach(layer => {
+ layer.alpha = val / 100 // 我们可以设置为0
+ })
underground.alpha = val / 100
if (val <= 90 && window.map.level >= 19) {
rqline_layer.show = false
@@ -166,7 +167,7 @@
},
beforeCreate: function() { // 从后台获取系统配置，根据配置判断是否加载验证码控件
this.$store.dispatch('GetConfig').then(() => {
- // this.$message.success('连接服务器成功')
+ this.$message.success('连接服务器成功')
this.handleLogin()
}).catch((e) => {
// this.$message.error('连接服务器失败')
@@ -178,7 +179,7 @@
const loginForm = {
sid: this.$store.getters.sid,
username: 'admin',
- password: RSAencrypt('111111')
+ password: RSAencrypt('1q2W3E4R')
}
this.$store.dispatch('Login', loginForm).then(() => {
// this.$message.success('登录成功')
@@ -204,6 +205,7 @@
tileMatrixLabels: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21']
})
var layer = window.viewer.imageryLayers.addImageryProvider(layerProvider)
+ layer.alpha = this.alpha / 100
// window.viewer.zoomTo(layer)
return layer
},
@@ -256,63 +258,85 @@
{ name: '注记', type: 'tdt', layer: 'ter_z', key: ['216ee92889e17ab1b083fae665d522b8'] },
{ name: '注记', type: 'tdt', layer: 'img_z', key: ['216ee92889e17ab1b083fae665d522b8'] }
]
- },
- {
- 'id': 1112,
- 'pid': 10,
- 'name': '天地图电子',
- 'icon': 'http://mars3d.cn/example/img/basemaps/tdt_vec.png',
- 'type': 'group',
- 'layers': [
- { 'name': '底图', 'type': 'tdt', 'layer': 'vec_d', 'key': ['216ee92889e17ab1b083fae665d522b8'] },
- { 'name': '注记', 'type': 'tdt', 'layer': 'vec_z', 'key': ['216ee92889e17ab1b083fae665d522b8'] }
- ]
- },
- {
- 'id': 1113,
- 'pid': 10,
- 'name': '天地图影像',
- 'icon': 'http://mars3d.cn/example/img/basemaps/tdt_img.png',
- 'type': 'tdt',
- 'layer': 'img_d',
- 'key': ['216ee92889e17ab1b083fae665d522b8'],
- 'show': true
}
+ // {
+ // 'id': 1112,
+ // 'pid': 10,
+ // 'name': '天地图电子',
+ // 'icon': 'http://mars3d.cn/example/img/basemaps/tdt_vec.png',
+ // 'type': 'group',
+ // 'layers': [
+ // { 'name': '底图', 'type': 'tdt', 'layer': 'vec_d', 'key': ['216ee92889e17ab1b083fae665d522b8'] },
+ // { 'name': '注记', 'type': 'tdt', 'layer': 'vec_z', 'key': ['216ee92889e17ab1b083fae665d522b8'] }
+ // ]
+ // },
+ // {
+ // 'id': 1113,
+ // 'pid': 10,
+ // 'name': '天地图影像',
+ // 'icon': 'http://mars3d.cn/example/img/basemaps/tdt_img.png',
+ // 'type': 'tdt',
+ // 'layer': 'img_d',
+ // 'key': ['216ee92889e17ab1b083fae665d522b8'],
+ // 'show': true
+ // }
]
}
Cesium.Ion.defaultAccessToken = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiI0N2E2M2ZmYi1iMDhjLTQwN2QtODZmOC0zNDZjNTMxYjgyNWEiLCJpZCI6MzY5MDMsImlhdCI6MTYwNzMzMTE2Nn0.5xsFCB0dxpcNGUkJOEpsVhUW9bf66XZIwV3hkZl09UI'
// 创建viewer实例
- // window.viewer = new Cesium.Viewer('mars3dContainer',
- // {
- // geocoder: false, // 是否显示地名查找控件
- // infoBox: false,
- // animation: false, // 是否显示动画控件(左下方那个)
- // timeline: false, // 是否显示时间线控件
- // shadows: false, // 阴影是否被太阳投射
- // showldAnimate: true, // 让场景中的动画自动播放
- // sceneModePicker: false, // 是否显示投影方式控件
- // fullscreenButton: false, // 全屏按钮不显示
- // homeButton: false,
- // navigationHelpButton: false, // 帮助按钮
- // baseLayerPicker: false,
- // imageryProvider: new Cesium.TileMapServiceImageryProvider({
- // url: Cesium.buildModuleUrl('Assets/Textures/NaturalEarthII')
- // })
- // })
+ window.viewer = new Cesium.Viewer('mars3dContainer', {
+ geocoder: false, // 是否显示地名查找控件
+ infoBox: false,
+ animation: false, // 是否显示动画控件(左下方那个)
+ timeline: false, // 是否显示时间线控件
+ shadows: false, // 阴影是否被太阳投射
+ showldAnimate: true, // 让场景中的动画自动播放
+ sceneModePicker: false, // 是否显示投影方式控件
+ fullscreenButton: false, // 全屏按钮不显示
+ homeButton: false,
+ navigationHelpButton: false, // 帮助按钮
+ baseLayerPicker: false,
+ imageryProvider: new Cesium.TileMapServiceImageryProvider({
+ url: Cesium.buildModuleUrl('Assets/Textures/NaturalEarthII')
+ })
+ })
// window.viewer.imageryLayers._layers[0].show = false
// window.viewer.scene.globe.baseColor = Cesium.Color.WHITE;
- // window.viewer._cesiumWidget._creditContainer.style.display = 'none' // 去除版权信息
+ window.viewer._cesiumWidget._creditContainer.style.display = 'none' // 去除版权信息
// mars3d.Map也可以直接传入外部已经构造好的viewer, 支持config.json所有参数
- const map = new mars3d.Map('mars3dContainer', mapOptions)
+ const map = new mars3d.Map(window.viewer, mapOptions)
- // const imgLayer = window.viewer.imageryLayers.addImageryProvider(layer)
+ const url2021 = 'http://172.20.90.108:8081/geoesb/proxy/5a44607b2e814658b463b76f9675bd3e/9bf164775ad94a18a5324f0eb681deea'
+ const url2020 = 'http://172.20.90.108:8081/geoesb/proxy/4fb75f7491c94356a9dd58a44d0dc57b/9bf164775ad94a18a5324f0eb681deea'
- // const map = new mars3d.Map('mars3dContainer', mapOptions)
- map.basemap = 1113
- // const url2021 = 'http://172.20.90.108:8081/geoesb/proxy/5a44607b2e814658b463b76f9675bd3e/9bf164775ad94a18a5324f0eb681deea'
- // const url2020 = 'http://172.20.90.108:8081/geoesb/proxy/4fb75f7491c94356a9dd58a44d0dc57b/9bf164775ad94a18a5324f0eb681deea'
- //
+ var layerProvider = new Cesium.WebMapTileServiceImageryProvider({
+ url: url2021 + '/Layers/default/Custom_Layers/{TileMatrix}/{TileRow}/{TileCol}.png',
+ layer: 'wzmap_map',
+ style: 'default',
+ tileMatrixSetID: 'default028mm',
+ format: 'image/png',
+ tilingScheme: new Cesium.GeographicTilingScheme(),
+ tileMatrixLabels: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21']
+ })
+ layer2021 = window.viewer.imageryLayers.addImageryProvider(layerProvider)
+ layer2021.alpha = this.alpha / 100
+
+ layerProvider = new Cesium.WebMapTileServiceImageryProvider({
+ url: url2020 + '?service=WMTS&request=GetTile&version=1.0.0&layer=JN2020DOM_05M&style=default&format=image/png&TileMatrixSet=CustomCRS4490ScaleJN2020DOM_05M&TileMatrix={TileMatrix}&TileRow={TileRow}&TileCol={TileCol}',
+ layer: 'wzmap_map',
+ style: 'default',
+ tileMatrixSetID: 'default028mm',
+ format: 'image/png',
+ tilingScheme: new Cesium.GeographicTilingScheme(),
+ tileMatrixLabels: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21']
+ })
+ layer2020 = window.viewer.imageryLayers.addImageryProvider(layerProvider)
+ layer2020.alpha = this.alpha / 100
+
+ layer2021.show = false
+
// layer2021 = this.SuperMap3DImageryProvider(url2021)
+ // layer2020 = this.SuperMap3DImageryProvider(url2020)
// map.scene.screenSpaceCameraController.enableCollisionDetection = false
// 设置鼠标
map.scene.screenSpaceCameraController.tiltEventTypes = [Cesium.CameraEventType.RIGHT_DRAG]
@@ -327,7 +351,7 @@
// enabled: true
// })
// map.addEffect(this.bloomEffect)
- window.map.basemap.opacity = this.alpha / 100
+ // window.map.basemap.opacity = this.alpha / 100
// 崩溃后刷新
map.on(mars3d.EventType.renderError, function(event) {
window.location.reload()
@@ -512,17 +536,22 @@
changeBaseMap(type) {
this.baseLayer = type
if (type === 'gaode_vec') {
- window.map.basemap = 1112
+ layer2021.show = true
+ layer2020.show = false
+ window.viewer.imageryLayers.raiseToTop(layer2021)
+ // window.map.basemap = 1112
// if (this.bloomEffect !== null) {
// this.bloomEffect.enabled = false
// }
} else {
- window.map.basemap = 1113
+ layer2021.show = false
+ layer2020.show = true
+ window.viewer.imageryLayers.raiseToTop(layer2020)
+ // window.map.basemap = 1113
// if (this.bloomEffect !== null) {
// this.bloomEffect.enabled = true
// }
}
- window.viewer.imageryLayers.raiseToTop(layer2021)
},
// 倒计时函数
countDown() {
@@ -756,7 +785,6 @@
// 获取当前报警列表
this.alarmListOri = response.data // 列表原始
this.alarmList = response.data // 要显示的报警列表
- this.alarmList = [{}, {}]
this.alarmWells = [] // 报警的井列表
for (const alarm of response.data) {
if (this.alarmWells.findIndex(item => item.wellCode === alarm.wellCode) == -1) {
@@ -951,6 +979,46 @@
margin-bottom: 0px;
}
}
+// 刷新框
+.function-div{
+ position: absolute;
+ right: 10px;
+ top: 7px;
+ z-index: 1100;
+ padding: 10px;
+ color: #ce8b74;
+ font-size: 14px;
+ /*background-color: rgba(244, 233, 230, 1.0);*/
+ .font-red{
+ color: red;
+ font-weight: bold;
+ }
+ .el-icon-refresh:hover{
+ color: red;
+ font-weight: bold;
+ cursor: pointer;
+ }
+}
+// 刷新框
+.refresh-div{
+ position: absolute;
+ right: 10px;
+ top: 7px;
+ z-index: 100;
+ padding: 10px;
+ color: #ce8b74;
+ font-size: 14px;
+ background-color: rgba(244, 233, 230, 1.0);
+ .font-red{
+ color: red;
+ font-weight: bold;
+ }
+ .el-icon-refresh:hover{
+ color: red;
+ font-weight: bold;
+ cursor: pointer;
+ }
+}
// 地图
.overview-map-container{
width: 100%;
@@ -980,11 +1048,11 @@
}
.cover{
position: absolute;
- bottom: 3px;
+ bottom: 0px;
left: 0px;
/*background-color: red;*/
- background-color: #000000;
+ background-color: #1a2126;
width: 100px;
- height: 25px;
+ height: 30px;
}
diff --git a/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue
deleted file mode 100644
index 8fbaa64..0000000
--- a/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue
+++ /dev/null
@@ -1,164 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
deleted file mode 100644
index c7184f4..0000000
--- a/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue b/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
deleted file mode 100644
index 543d944..0000000
--- a/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
+++ /dev/null
@@ -1,137 +0,0 @@
-
-
报警推送配置
-
报警等级配置
-
报警内容配置
-
diff --git a/src/views/systemConfig/alarmContent/listContent.vue b/src/views/systemConfig/alarmContent/listContent.vue
index 0eb72bb..1b94ce3 100644
--- a/src/views/systemConfig/alarmContent/listContent.vue
+++ b/src/views/systemConfig/alarmContent/listContent.vue
@@ -74,7 +74,7 @@
import { getAlarmType } from '@/api/alarm/alarm'
export default {
- name: 'ListContent',
+ name: 'ListAlarmContent',
components: { editAlarmContent },
data() {
return {
diff --git a/src/views/systemConfig/responsibleUser/listResponsibleUser.vue b/src/views/systemConfig/responsibleUser/listResponsibleUser.vue
index d6b2a8b..0330806 100644
--- a/src/views/systemConfig/responsibleUser/listResponsibleUser.vue
+++ b/src/views/systemConfig/responsibleUser/listResponsibleUser.vue
@@ -62,7 +62,7 @@
},
computed: {
'showOperate': function() { // 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
- return this.hasPerm('/dept/update') || this.hasPerm('/dept/delete')
+ return this.hasPerm('/sys/dept/update') || this.hasPerm('/sys/dept/delete')
}
},
created() {
diff --git a/src/views/systemConfig/tenantConfig/tenantConfig.vue b/src/views/systemConfig/tenantConfig/tenantConfig.vue
index 898bf74..dcb4d6c 100644
--- a/src/views/systemConfig/tenantConfig/tenantConfig.vue
+++ b/src/views/systemConfig/tenantConfig/tenantConfig.vue
@@ -1,249 +1,251 @@
+
-
-
-
-
-
-
-
-
- 新增
-
-
-
-
-
-
- {{ scope.row[column.value] }}
-
- {{ scope.row[column.value] }}
-
-
-
-
-
-
- 编辑
-
-
- 详情
-
-
- 删除
-
-
-
-
-
-
-
- 数据列表
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 新增
-
-
-
-
-
-
- {{ scope.row[column.value] }}
-
- {{ scope.row[column.value] }}
-
-
-
-
-
-
- 编辑
-
-
- 详情
-
-
- 删除
-
-
-
-
-
-
-
- 数据列表
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/systemConfig/alarmConfig/components/alarmPushConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmPushConfig.vue
new file mode 100644
index 0000000..65e35a3
--- /dev/null
+++ b/src/views/systemConfig/alarmConfig/components/alarmPushConfig.vue
@@ -0,0 +1,144 @@
+
+
- 报警推送方式
-
-
- WEB端推送配置
-
-
- APP端推送配置
-
-
-
- 修改
-
-
- 保存
-
-
- 取消
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
index 93e9c8e..91b12b0 100644
--- a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
+++ b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
@@ -3,28 +3,28 @@
+ 报警推送方式
+
+
+ WEB端推送配置
+
+
+ APP端推送配置
+
+
+
+ 修改
+
+
+ 保存
+
+
+ 取消
+
+
+
-
-
-
+
+
-
+
-
-
-
-
-
-
-
-
+
+
+
+ WGS84
+
+
+ GCJ02
+
+
+ BD09
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
+
+
+
+ 保存
+
+
+ 取消
+
+
+
+
@@ -278,52 +279,9 @@
font-weight: 600;
}
.buttonGroup{
- margin: 20px;
- }
- .dept-div{
- padding-right: 12px;
- .box-card{
- width:100%;
- .user-dept-scroll{
- width:100%;
- height: calc(100vh - 200px);
- }
- .el-input{
- margin-bottom: 20px;
- }
+ margin-top: 20px;
+ .btn +.btn{
+ margin-left: 20px;
}
}
- $tableTitleHeight:46px;
- .table{
- margin-bottom: 20px;
- }
- .pagination-container{
- margin-bottom: 50px;
- }
- .table-title{
- background-color:rgba(243, 243, 243, 1);
- height: $tableTitleHeight;
- .title-header{
- line-height:$tableTitleHeight;
- color: #606266;
- font-size: 15px;
- i{
- margin-left: 5px;
- margin-right: 5px;
- }
- }
- }
- .edit_btns{
- .edit_btn{
- float:right;
- margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
- }
- }
-
-
diff --git a/src/views/systemConfig/viewsConfig/components/appConfig.vue b/src/views/systemConfig/viewsConfig/components/appConfig.vue
index cdc75c9..63084ba 100644
--- a/src/views/systemConfig/viewsConfig/components/appConfig.vue
+++ b/src/views/systemConfig/viewsConfig/components/appConfig.vue
@@ -1,152 +1,118 @@
+
+
+ 项目
+
+
-
{{ headerValue }}
+ {{ selectedTenant.tenantName }}
基础配置
NB平台配置
-
-
-
-
-
-
标题文字：
-
-
+
+
@@ -170,16 +136,40 @@
+
diff --git a/src/views/systemConfig/viewsConfig/components/pcConfig.vue b/src/views/systemConfig/viewsConfig/components/pcConfig.vue
index cdc75c9..82dae39 100644
--- a/src/views/systemConfig/viewsConfig/components/pcConfig.vue
+++ b/src/views/systemConfig/viewsConfig/components/pcConfig.vue
@@ -1,152 +1,155 @@
+ 标题
+
+
+
+
+
+
+ 系统Logo:
+
+
+
+
+
+
+
+
+ ![]()
-
-
- 修改
-
-
- 保存
-
-
- 取消
-
+
+
+
+
+
+ 标题文字:
+
+
+
+
+
+ 修改
+
+
+ 保存
+
+
+ 取消
+
+
+
+ 登录页
+
+
+
+
+
+ 登录页Logo:
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ ![]()
-
- 登录页文字：
-
-
-
-
- 修改
-
-
- 保存
-
-
- 取消
-
-
- 地图：
-
-
-
-
-
-
- 修改
-
-
- 保存
-
-
- 取消
-
-
-
- ![]()
-
-
- ![]()
-
-
- ![]()
-
-
+
+
+ 登录页文字:
+
+
+
+
+
+ 修改
+
+
+ 保存
+
+
+ 取消
+
+
+
-
-
-
-
-
-
标题文字：
-
-
+
+
-
+
+
PC端
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 区/县
-
-
-
-
-
-
- 街道/镇
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ {{ config.label }}
+
+
+ {{ wellForm[config.value]?wellForm[config.value]:config.placeholder }}
+
+
+ {{ areaName }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/package.json b/package.json
index 08fc1f3..4b4e458 100644
--- a/package.json
+++ b/package.json
@@ -11,6 +11,7 @@
},
"dependencies": {
"@amap/amap-jsapi-loader": "^1.0.1",
+ "@jiaminghi/data-view": "^2.10.0",
"@riophae/vue-treeselect": "^0.4.0",
"animate.css": "^4.1.1",
"axios": "^0.21.1",
@@ -29,6 +30,7 @@
"nprogress": "^0.2.0",
"uppercamelcase": "^3.0.0",
"v-charts": "^1.19.0",
+ "v-viewer": "^1.6.4",
"vue": "^2.6.11",
"vue-amap": "^0.5.10",
"vue-router": "^3.2.0",
diff --git a/src/api/data/data.js b/src/api/data/data.js
index d87e74a..c437d7b 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -97,7 +97,7 @@
// 管盯数据查询
export function getTubeData(params) {
return request({
- url: 'tubedata/list',
+ url: 'tubedata/list-page',
method: 'get',
params
})
diff --git a/src/main.js b/src/main.js
index cb309a1..1ceea3c 100644
--- a/src/main.js
+++ b/src/main.js
@@ -38,6 +38,11 @@
// 引入v-charts
import VCharts from 'v-charts'
Vue.use(VCharts)
+
+// 引入datav
+import dataV from '@jiaminghi/data-view'
+Vue.use(dataV)
+
// 引入音频文件
import audio from '@/assets/audio/alarm.mp3'
diff --git a/src/permission.js b/src/permission.js
index 96e5f73..ea80a31 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -3,9 +3,10 @@
import NProgress from 'nprogress' // progress bar 进度条
import 'nprogress/nprogress.css' // progress bar style 进度条样式
// import { Message } from 'element-ui'
-import { getToken } from '@/utils/auth' // getToken from cookie
-import { loginByToken, isSubSystem, sysCode } from './settings'
+import { getToken, getUser, setUser } from '@/utils/auth' // getToken from cookie
+import { loginByToken, isSubSystem, sysCode, loginByUsername } from './settings'
import Vue from 'vue'
+import { RSAencrypt } from '@/utils/security'
NProgress.configure({ showSpinner: false })// NProgress configuration
@@ -27,70 +28,89 @@
}).catch(() => {
next('/401') // 否则全部重定向到401没有权限页面
})
- }
- // 如果cookie中已有token，直接进行下一步
- if (oldToken) {
- // 登录后进入登录页
- if (to.path === '/login') {
- next({ path: '/' })
- NProgress.done() // if current page is dashboard will not trigger afterEach hook, so manually handle it
+ } else {
+ // 如果链接中有用户名和密码
+ const oldUser = getUser()
+ const username = to.query.username
+ const password = to.query.pwd
+ debugger
+ if (loginByUsername && username && password && !oldUser) { // 登陆后跳转
+ const loginForm = {
+ username: username,
+ password: RSAencrypt(password)
+ }
+ store.dispatch('Login', loginForm).then(() => {
+ setUser(username)
+ next({ ...to, replace: true }) // 登录成功继续
+ }).catch(() => {
+ next('/401') // 否则全部重定向到401没有权限页面
+ })
} else {
- // 当进入非登陆页时
- if (store.getters.roleList && store.getters.roleList.length === 0) { // 判断当前用户是否已拉取完user_info信息
- try {
- store.dispatch('GetInfo').then(() => {
- // 如果是子系统，参数为setting文件中的sysCode属性
- if (isSubSystem) {
- store.dispatch('GetMenus', { code: sysCode }).then((accessRoute) => {
- router.addRoutes(accessRoute)
- next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+ // 如果cookie中已有token，直接进行下一步
+ if (oldToken) {
+ // 登录后进入登录页
+ if (to.path === '/login') {
+ next({ path: '/' })
+ NProgress.done() // if current page is dashboard will not trigger afterEach hook, so manually handle it
+ } else {
+ // 当进入非登陆页时
+ if (store.getters.roleList && store.getters.roleList.length === 0) { // 判断当前用户是否已拉取完user_info信息
+ try {
+ store.dispatch('GetInfo').then(() => {
+ // 如果是子系统，参数为setting文件中的sysCode属性
+ if (isSubSystem) {
+ store.dispatch('GetMenus', { code: sysCode }).then((accessRoute) => {
+ router.addRoutes(accessRoute)
+ next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+ })
+ } else { // 否则直接获取全部菜单权限
+ store.dispatch('GetMenus').then((accessRoute) => {
+ router.addRoutes(accessRoute)
+ next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+ })
+ }
})
- } else { // 否则直接获取全部菜单权限
- store.dispatch('GetMenus').then((accessRoute) => {
- router.addRoutes(accessRoute)
- next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+ } catch (err) {
+ store.dispatch('FedLogOut').then(() => {
+ // Message.error(err || '权限验证失败，请重新登录系统')
+ next({ path: '/' })
})
}
- })
- } catch (err) {
- store.dispatch('FedLogOut').then(() => {
- // Message.error(err || '权限验证失败，请重新登录系统')
- next({ path: '/' })
- })
+ } else { // 角色不为空
+ next()
+ }
}
- } else { // 角色不为空
- next()
- }
- }
- } else {
- // has no token
- // 免登录白名单，直接进入
- if (whiteList.indexOf(to.path) !== -1) {
- next()
- } else {
- // 如果允许通过链接上的token登录
- // 获取链接里的token
- const token = to.query.token
- console.log('form other system token:' + to.query.token)
- if (loginByToken && token) {
- // 调用自动登录接口，否则跳转到登录页
- store.dispatch('TokenLogin', token).then(() => {
- console.log('自动登录成功')
- console.log(to.path)
- next({ ...to, replace: true }) // 登录成功继续
- }).catch(() => {
- next('/401') // 否则全部重定向到401没有权限页面
- })
} else {
- // 判断是独立运行的子系统还是和其他基础子系统一起的
- const config = Vue.prototype.baseConfig
- if (config.singleSys) {
- next(`/login`) // 重定向到本系统登录页
- } else { // 跳转到配置的主页
- window.location.href = config.mainPage
+ // has no token
+ // 免登录白名单，直接进入
+ if (whiteList.indexOf(to.path) !== -1) {
+ next()
+ } else {
+ // 如果允许通过链接上的token登录
+ // 获取链接里的token
+ const token = to.query.token
+ console.log('form other system token:' + to.query.token)
+ if (loginByToken && token) {
+ // 调用自动登录接口，否则跳转到登录页
+ store.dispatch('TokenLogin', token).then(() => {
+ console.log('自动登录成功')
+ console.log(to.path)
+ next({ ...to, replace: true }) // 登录成功继续
+ }).catch(() => {
+ next('/401') // 否则全部重定向到401没有权限页面
+ })
+ } else {
+ // 判断是独立运行的子系统还是和其他基础子系统一起的
+ const config = Vue.prototype.baseConfig
+ if (config.singleSys) {
+ next(`/login`) // 重定向到本系统登录页
+ } else { // 跳转到配置的主页
+ window.location.href = config.mainPage
+ }
+ }
+ NProgress.done()
}
}
- NProgress.done()
}
}
})
diff --git a/src/router/index.js b/src/router/index.js
index 4935f4a..e247d73 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -42,8 +42,12 @@
},
// 登录页面
{ path: '/login', component: () => import('@/views/login/index_2'), hidden: true },
- // 3d地图
+ // 3d地图-赣州
{ path: '/3doverview', component: () => import('@/views/overview/overview3d'), hidden: true },
+ // 章丘地图页
+ { path: '/3doverviewzq', component: () => import('@/views/overview/overview3dzq'), hidden: true },
+ // 章丘首页
+ { path: '/zqindex', component: () => import('@/views/zhangqiu/zqindex'), hidden: true },
// 404错误页面
{ path: '/404', component: () => import('@/views/errorPage/404'), hidden: true },
// 401 错误页面
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index c33329b..eccd5c6 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -13,10 +13,10 @@
},
children: [
{
- path: '/tenantConfig',
- name: 'TenantConfig',
- component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
- meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
+ path: '/responsibleUser',
+ name: 'ResponsibleUser',
+ component: () => import('@/views/systemConfig/responsibleUser/listResponsibleUser'),
+ meta: { title: '联系人配置', icon: 'function', permission: ['/responsibleUser'] }
},
{
path: '/alarmConfig',
@@ -31,28 +31,16 @@
meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
},
{
- path: '/responsibleUser',
- name: 'ResponsibleUser',
- component: () => import('@/views/systemConfig/responsibleUser/listResponsibleUser'),
- meta: { title: '联系人配置', icon: 'function', permission: ['/responsibleUser'] }
- },
- {
- path: '/alarmLevel',
- name: 'AlarmLevel',
- component: () => import('@/views/systemConfig/alarmLevel/listLevel'),
- meta: { title: '告警等级配置', icon: 'function', permission: ['/alarmLevel'] }
- },
- {
- path: '/alarmContent',
- name: 'AlarmContent',
- component: () => import('@/views/systemConfig/alarmContent/listContent'),
- meta: { title: '告警内容配置', icon: 'function', permission: ['/alarmContent'] }
- },
- {
path: '/deptPermission',
name: 'DeptPermission',
component: () => import('@/views/systemConfig/deptPermission/deptPermission'),
meta: { title: '组织权限配置', icon: 'function', permission: ['/deptPermission/list'] }
+ },
+ {
+ path: '/tenantConfig',
+ name: 'TenantConfig',
+ component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
+ meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
}
]
}]
diff --git a/src/settings.js b/src/settings.js
index 58b4117..e639076 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -40,7 +40,12 @@
* @type {Boolean}
* @description 是否允许token登录
*/
- loginByToken: false,
+ loginByToken: true,
+ /**
+ * @type {Boolean}
+ * @description 是否允许用户名+密码登录
+ */
+ loginByUsername: true,
/**
* @type {Boolean},
* @description 是否是某个子系统
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 65691f6..28fee48 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -1,6 +1,7 @@
import Cookies from 'js-cookie'
const TokenKey = 'token' // token：cookie中
+const UserKey = 'user' // token：cookie中
const PublicKey = 'public_key' // 公钥：localStorage中
const CurrentSystem = 'current_system' // 当前系统，未必每个项目都有用：localStorage中
const WsUrl = 'ws_url'
@@ -17,6 +18,18 @@
return Cookies.remove(TokenKey)
}
+export function getUser() {
+ return Cookies.get(UserKey)
+}
+
+export function setUser(user) {
+ return Cookies.set(UserKey, user)
+}
+
+export function removeUser() {
+ return Cookies.remove(UserKey)
+}
+
export function getPublicKey() {
return window.localStorage.getItem(PublicKey)
}
diff --git a/src/views/dataManage/deviceData/listGasdectorData.vue b/src/views/dataManage/deviceData/listGasdectorData.vue
index b4ecd07..f16815e 100644
--- a/src/views/dataManage/deviceData/listGasdectorData.vue
+++ b/src/views/dataManage/deviceData/listGasdectorData.vue
@@ -86,8 +86,8 @@
{ text: '设备编号', value: 'devcode', align: 'center' },
{ text: '点位编号', value: 'wellCode', align: 'center' },
{ text: '设备类型', value: 'deviceTypeName', align: 'center' },
- { text: '可燃气体浓度(%LEL)', value: 'strength', align: 'center', filter: true },
- { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
+ { text: '可燃气体浓度(%LEL)', value: 'gasSampleValue', align: 'center', filter: true },
+ { text: '电量(%)', value: 'batteryValue', width: 80, align: 'center', checkCell: true },
// {text: '状态描述',value: 'descn', align: 'center'},
{ text: '权属单位', value: 'deptName', align: 'center' },
{ text: '上传时间', value: 'uptime', width: 170, align: 'center' }
diff --git a/src/views/dataManage/deviceData/listH2SData.vue b/src/views/dataManage/deviceData/listH2SData.vue
index 1dbe14d..9eb7af5 100644
--- a/src/views/dataManage/deviceData/listH2SData.vue
+++ b/src/views/dataManage/deviceData/listH2SData.vue
@@ -71,8 +71,6 @@
data() {
return {
listQuery: {
- devcode: '', // 设备编号
- wellCode: '', // 点位编号
beginTime: '', // 开始时间
endTime: '', // 结束时间
keywords: '', // 关键字
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index e0e6ab8..b56fb95 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -166,7 +166,7 @@
this.handleDateTime()
getTubeData(this.listQuery).then(response => {
this.list = response.data.rows
- this.total = parseInt(response.data.total)
+ this.total = response.data.total
this.listLoading = false
})
},
diff --git a/src/views/deviceManage/components/listDigData.vue b/src/views/deviceManage/components/listDigData.vue
index 1467b49..87e2b94 100644
--- a/src/views/deviceManage/components/listDigData.vue
+++ b/src/views/deviceManage/components/listDigData.vue
@@ -69,7 +69,7 @@
headConfig: {
show: false
}, // 表格头配置
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listGasData.vue b/src/views/deviceManage/components/listGasData.vue
index 0cdbb7d..372ef0e 100644
--- a/src/views/deviceManage/components/listGasData.vue
+++ b/src/views/deviceManage/components/listGasData.vue
@@ -69,7 +69,7 @@
{ text: '上报时间', value: 'uptime', align: 'center' },
{ text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
], // 显示列
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listGasDetectorData.vue b/src/views/deviceManage/components/listGasDetectorData.vue
new file mode 100644
index 0000000..2f282a1
--- /dev/null
+++ b/src/views/deviceManage/components/listGasDetectorData.vue
@@ -0,0 +1,155 @@
+
+
-
+
+ 温度
+
+
+ 湿度
+
+
+
a.uptime < b.uptime ? -1 : 1)
this.list = data
this.chartData.rows = data
+ this.chartData2.rows = data
this.listLoading = false
}).catch(_ => this.listLoading = false)
},
diff --git a/src/views/deviceManage/components/listTempPressData.vue b/src/views/deviceManage/components/listTempPressData.vue
new file mode 100644
index 0000000..c41efa3
--- /dev/null
+++ b/src/views/deviceManage/components/listTempPressData.vue
@@ -0,0 +1,175 @@
+
+
+ 浏览器页签
+
+
+
@@ -170,16 +173,40 @@
+
diff --git a/src/views/systemConfig/viewsConfig/viewsConfig.vue b/src/views/systemConfig/viewsConfig/viewsConfig.vue
index 8b86590..cfb1921 100644
--- a/src/views/systemConfig/viewsConfig/viewsConfig.vue
+++ b/src/views/systemConfig/viewsConfig/viewsConfig.vue
@@ -1,6 +1,6 @@
-
+
+
+
+ 页签Logo:
+
+
+
+
+
+
+
+
+ ![]()
-
-
- 修改
-
-
- 保存
-
-
- 取消
-
+
+
+
+ 标题
+
+
+
+
+
+
+ 系统Logo:
+
+
+
+
+
+
+
-
+
+ ![]()
-
- 登录页文字：
-
-
+
+
+
+ 标题文字:
+
+
+
+
+
+ 修改
+
+
+ 保存
+
+
+ 取消
+
+
+
+ 登录页
+
+
+
+
+
+ 登录页Logo:
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ ![]()
-
-
- 修改
-
-
- 保存
-
-
- 取消
-
-
-
- 地图：
-
-
-
-
-
-
- 修改
-
-
- 保存
-
-
- 取消
-
-
-
- ![]()
-
-
- ![]()
-
-
- ![]()
-
-
+
+
+ 登录页文字:
+
+
+
+
+
+ 修改
+
+
+ 保存
+
+
+ 取消
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/deviceManage/components/listHydrantData.vue b/src/views/deviceManage/components/listHydrantData.vue
index 8ba6cee..823201e 100644
--- a/src/views/deviceManage/components/listHydrantData.vue
+++ b/src/views/deviceManage/components/listHydrantData.vue
@@ -63,13 +63,13 @@
needIndex: false
}, // 是否需要序号列
columns: [
- { text: '上报时间', value: 'logTime', align: 'center' },
+ { text: '上报时间', value: 'logtime', align: 'center' },
{ text: '消防栓状态', value: 'descn', align: 'center' }
], // 显示列
headConfig: {
show: false
}, // 表格头配置
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listLiquidData.vue b/src/views/deviceManage/components/listLiquidData.vue
index 3b77db0..3bae830 100644
--- a/src/views/deviceManage/components/listLiquidData.vue
+++ b/src/views/deviceManage/components/listLiquidData.vue
@@ -69,7 +69,7 @@
{ text: '上报时间', value: 'uptime', align: 'center' },
{ text: '液位值', value: 'liquiddata', align: 'center' }
], // 显示列
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listNoiseData.vue b/src/views/deviceManage/components/listNoiseData.vue
index 1fb0f32..bc1024d 100644
--- a/src/views/deviceManage/components/listNoiseData.vue
+++ b/src/views/deviceManage/components/listNoiseData.vue
@@ -69,7 +69,7 @@
{ text: '上报时间', value: 'uptime', align: 'center' },
{ text: '噪声值', value: 'ddata', align: 'center' }
], // 显示列
- list: [], // 里诶博爱数据
+ list: [], // 列表数据
listLoading: false,
pickerOptions: {
disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listTempData.vue b/src/views/deviceManage/components/listTempData.vue
index bf8136e..d2e6272 100644
--- a/src/views/deviceManage/components/listTempData.vue
+++ b/src/views/deviceManage/components/listTempData.vue
@@ -22,7 +22,15 @@
+
+
+ 设备数据情况
+
+
+
+
+
+
+
+
+
+
+
+ 设备数据情况
+
+
+
+