diff --git a/public/img/home/h_l_icon1.png b/public/img/home/h_l_icon1.png new file mode 100644 index 0000000..0af1793 Binary files /dev/null and b/public/img/home/h_l_icon1.png differ diff --git a/public/img/home/h_l_icon2.png b/public/img/home/h_l_icon2.png new file mode 100644 index 0000000..bc01410 Binary files /dev/null and b/public/img/home/h_l_icon2.png differ diff --git a/public/img/home/h_m_icon1.png b/public/img/home/h_m_icon1.png new file mode 100644 index 0000000..7cde527 Binary files /dev/null and b/public/img/home/h_m_icon1.png differ diff --git a/public/img/home/h_m_icon2.png b/public/img/home/h_m_icon2.png new file mode 100644 index 0000000..fd23c5a Binary files /dev/null and b/public/img/home/h_m_icon2.png differ diff --git a/public/img/home/h_m_icon3.png b/public/img/home/h_m_icon3.png new file mode 100644 index 0000000..829dc69 Binary files /dev/null and b/public/img/home/h_m_icon3.png differ diff --git a/public/img/home/h_m_icon4.png b/public/img/home/h_m_icon4.png new file mode 100644 index 0000000..d1b62a4 Binary files /dev/null and b/public/img/home/h_m_icon4.png differ diff --git a/public/img/home/h_r_icon2.png b/public/img/home/h_r_icon2.png new file mode 100644 index 0000000..6e2d5d5 Binary files /dev/null and b/public/img/home/h_r_icon2.png differ diff --git a/public/img/home/h_r_icon3.png b/public/img/home/h_r_icon3.png new file mode 100644 index 0000000..6ee4934 Binary files /dev/null and b/public/img/home/h_r_icon3.png differ diff --git a/public/img/home/h_r_icon4.png b/public/img/home/h_r_icon4.png new file mode 100644 index 0000000..c434556 Binary files /dev/null and b/public/img/home/h_r_icon4.png differ diff --git a/public/img/home/h_r_icon5.png b/public/img/home/h_r_icon5.png new file mode 100644 index 0000000..4654087 Binary files /dev/null and b/public/img/home/h_r_icon5.png differ diff --git a/public/img/home/home_bg_l.png b/public/img/home/home_bg_l.png new file mode 100644 index 0000000..05b439f Binary files /dev/null and b/public/img/home/home_bg_l.png differ diff --git a/public/img/home/home_bg_m.png b/public/img/home/home_bg_m.png new file mode 100644 index 0000000..80e5a43 Binary files /dev/null and b/public/img/home/home_bg_m.png differ diff --git a/public/img/home/home_bg_r.png b/public/img/home/home_bg_r.png new file mode 100644 index 0000000..7bdc15b Binary files /dev/null and b/public/img/home/home_bg_r.png differ diff --git a/src/App.vue b/src/App.vue index 1c5e5f7..1f39e67 100644 --- a/src/App.vue +++ b/src/App.vue @@ -106,4 +106,7 @@ align-items: center; justify-content: space-around; } - + .el-message__icon{ + font-size: 16px; + } + diff --git a/src/api/source/total.js b/src/api/source/total.js index 31398ca..4da225d 100644 --- a/src/api/source/total.js +++ b/src/api/source/total.js @@ -335,3 +335,214 @@ export const getWeather = () => { params: {}, }); }; + +// 首页改版总览 20221208---------------------------------------------------------------- +//业务区及塔台总人数 - 业务区(封闭运行) +export const getAllJZByDate = (date) => { + return request({ + url: "/epiHome/epidemicback/getAllJZByDate", + method: "get", + params: {date}, + }); +}; +//获取胶州机关行政人员总人数 +export const getJZAdminByDate = (date) => { + return request({ + url: "/epiHome/getJZAdminByDate", + method: "get", + params: {date}, + }); +}; +//在青、外地总人数 +export const getIsLeaveByDate = (date) => { + return request({ + url: "/epiHome/getIsLeaveByDate", + method: "get", + params: {date}, + }); +}; +//休假外出/出差人数 +export const getLeaveByDate = (date) => { + return request({ + url: "/epiHome/getLeaveByDate", + method: "get", + params: {date}, + }); +}; +//备勤、居家总人数 +export const getAllBQByDate = (date) => { + return request({ + url: "/epiHome/getAllBQByDate", + method: "get", + params: {date}, + }); +}; +//流亭总人数 +export const getAllLTByDate = (date) => { + return request({ + url: "/epiHome/getAllLTByDate", + method: "get", + params: {date}, + }); +}; +//流亭台站总人数 +export const getAllLTTZByDate = (date) => { + return request({ + url: "/epiHome/getAllLTTZByDate", + method: "get", + params: {date}, + }); +}; +//集中隔离 - 获取今日健康码、行程码信息 +export const getCodeByDate = (date) => { + return request({ + url: "/epiHome/epi-code/getCodeByDate", + method: "get", + params: {date}, + }); +}; +//公寓使用情况 +export const getDorInfo = (date) => { + return request({ + url: "/epiHome/epi-report/getDorInfo", + method: "get", + params: {date}, + }); +}; +//航班 +export const getPlaneInfo = (date) => { + return request({ + url: "/epiHome/epi-report/getPlaneInfo", + method: "get", + params: {date}, + }); +}; +//访客 +export const getGardenAndApprove = (date) => { + return request({ + url: "/epiHome/epidemicback/getGardenAndApprove", + method: "get", + params: {date}, + }); +}; +/** + * 运行保障 +*/ +//获取业务区以及塔台人员(管制部分) +export const getGZWorkPersonByJ = (date) => { + return request({ + url: "/epiHome/getGZWorkPersonByJ", + method: "get", + params: {date}, + }); +}; +//获取各台站运行人员 +export const getTowerPerson = (date) => { + return request({ + url: "/epiHome/getTowerPerson", + method: "get", + params: {date}, + }); +}; +//获取运行管理人员 +export const getRunAdminPersonByJ = (date) => { + return request({ + url: "/epiHome/getRunAdminPersonByJ", + method: "get", + params: {date}, + }); +}; +//获取业务区保障人员 +export const getSafePersonByJ = (date) => { + return request({ + url: "/epiHome/getSafePersonByJ", + method: "get", + params: {date}, + }); +}; +/** + * 流亭及备勤 +*/ +//获取流亭-园区人员 +export const getGardenPersonByL = (date) => { + return request({ + url: "/epiHome/getGardenPersonByL", + method: "get", + params: {date}, + }); +}; +//获取流亭-备勤人员 +export const getDormitoryPersonByL = (date) => { + return request({ + url: "/epiHome/getDormitoryPersonByL", + method: "get", + params: {date}, + }); +}; +/** + * 行政办公 +*/ +//行政办公人员 +export const getPersonByJ = (date) => { + return request({ + url: "/epiHome/getPersonByJ", + method: "get", + params: {date}, + }); +}; +//当日报修情况 +export const getRepair = (date) => { + return request({ + url: "/epiHome/epidemicback/getRepair", + method: "get", + params: {date}, + }); +}; +//共享资源 +export const getShare = (date) => { + return request({ + url: "/epiHome/epidemicback/getShare", + method: "get", + params: {date}, + }); +}; +//车辆资源 +export const getCarInfo = (date) => { + return request({ + url: "/epiHome/epidemicback/getCarInfo", + method: "get", + params: {date}, + }); +}; +//今日就餐情况 +export const getGardenEat = (date) => { + return request({ + url: "/epiHome/epidemicback/getGardenEat", + method: "get", + params: {date}, + }); +}; +//防疫要求-每日情况//0 正常 1 封闭运行 2 分区域运行 +export const getReportByDate = (date) => { + return request({ + url: "/epiHome/epi-report/getReportByDate", + method: "get", + params: {date}, + }); +}; +//节假日判断 +export const isHolidays = (date) => { + return request({ + url: "/epiHome/epi-report/isHolidays", + method: "get", + params: {date}, + }); +}; +//获取疫苗接种情况 +export const getYMInfo = (date) => { + return request({ + url: "/epiHome/getYMInfo", + method: "get", + params: {date}, + }); +}; \ No newline at end of file diff --git a/src/permission.js b/src/permission.js index ceb3520..b3ad5f0 100644 --- a/src/permission.js +++ b/src/permission.js @@ -11,7 +11,10 @@ import 'nprogress/nprogress.css' // progress bar style NProgress.configure({showSpinner: false}); const lockPage = store.getters.website.lockPage; //锁屏页 router.beforeEach((to, from, next) => { - console.log(to) + console.log(to); + if(to.path.indexOf('home') < 0){ + document.documentElement.style.fontSize = ''; + } const meta = to.meta || {}; const isMenu = meta.menu === undefined ? to.query.menu : meta.menu; store.commit('SET_IS_MENU', isMenu === undefined); diff --git a/src/router/views/index.js b/src/router/views/index.js index 5bc5daa..1d3c2bc 100644 --- a/src/router/views/index.js +++ b/src/router/views/index.js @@ -1,234 +1,247 @@ import Layout from '@/page/index/' export default [{ - path: '/garden', - component: Layout, - redirect: '/garden/index', - children: [{ - path: 'index', - name: '园区监控', - meta: { - i18n: 'dashboard' - }, - component: () => - import( /* webpackChunkName: "views" */ '@/views/garden/index') - }, { - path: 'monitoring', - name: '控制台', - meta: { - i18n: 'dashboard', - menu: false, - }, - component: () => - import( /* webpackChunkName: "views" */ '@/views/garden/monitoring') - }] - },{ - path: '/sourceAnaly', - component: Layout, - redirect: '/sourceAnaly/index', - children: [{ - path: 'index', - name: '能耗分析', - meta: { - i18n: 'dashboard' - }, - component: () => - import( /* webpackChunkName: "views" */ '@/views/sourceAnaly/index') - }] - },{ - path: '/equipment', - component: Layout, - redirect: '/equipment/index', - children: [{ - path: 'index', - name: '设备管理', - meta: { - i18n: 'dashboard' - }, - component: () => - import( /* webpackChunkName: "views" */ '@/views/equipment/index') - },{ - path: 'model', - name: '添加设备', - meta: { - i18n: 'dashboard' - }, - component: () => - import( /* webpackChunkName: "views" */ '@/views/equipment/model') - },{ - path: 'warnHistory', - name: '历史报警记录', - meta: { - i18n: 'dashboard' - }, - component: () => - import( /* webpackChunkName: "views" */ '@/views/equipment/warnHistory') - },{ - path: 'operationRecord', - name: '运维记录', - meta: { - i18n: 'dashboard' - }, - component: () => - import( /* webpackChunkName: "views" */ '@/views/equipment/operationRecord') - },{ - path: 'dataRecord', - name: '设备采集数据记录', - meta: { - i18n: 'dashboard' - }, - component: () => - import( /* webpackChunkName: "views" */ '@/views/equipment/dataRecord') - },{ - path: 'waterRecord', - name: '设备采集数据记录', - meta: { - i18n: 'dashboard' - }, - component: () => - import( /* webpackChunkName: "views" */ '@/views/equipment/waterRecord') - },{ - path: 'warmRecord', - name: '设备采集数据记录', - meta: { - i18n: 'dashboard' - }, - component: () => - import( /* webpackChunkName: "views" */ '@/views/equipment/warmRecord') - },{ - path: 'doorRecord', - name: '设备采集数据记录', - meta: { - i18n: 'dashboard' - }, - component: () => - import( /* webpackChunkName: "views" */ '@/views/equipment/doorRecord') - }] - }, - { - path: '/wel', - component: Layout, - redirect: '/wel/index', - children: [{ - path: 'index', - name: '首页', - meta: { - i18n: 'dashboard' - }, - component: () => - import( /* webpackChunkName: "views" */ '@/views/wel/index') - }, { - path: 'dashboard', - name: '控制台', - meta: { - i18n: 'dashboard', - menu: false, - }, - component: () => - import( /* webpackChunkName: "views" */ '@/views/wel/dashboard') - }] + path: '/garden', + component: Layout, + redirect: '/garden/home', + children: [{ + path: 'index', + name: '园区监控', + meta: { + i18n: 'dashboard' + }, + component: () => + import( /* webpackChunkName: "views" */ '@/views/garden/index') }, { - path: '/test', - component: Layout, - redirect: '/test/index', - children: [{ - path: 'index', - name: '测试页', - meta: { - i18n: 'test' - }, - component: () => - import( /* webpackChunkName: "views" */ '@/views/util/test') - }] + path: 'monitoring', + name: '控制台', + meta: { + i18n: 'dashboard', + menu: false, + }, + component: () => + import( /* webpackChunkName: "views" */ '@/views/garden/monitoring') + }] +}, { + path: '/garden', + component: Layout, + redirect: '/garden/home', + children: [{ + path: 'home', + name: '园区概况', + meta: { + i18n: 'dashboard' + }, + component: () => + import( /* webpackChunkName: "views" */ '@/views/garden/home') + }] +}, { + path: '/sourceAnaly', + component: Layout, + redirect: '/sourceAnaly/index', + children: [{ + path: 'index', + name: '能耗分析', + meta: { + i18n: 'dashboard' + }, + component: () => + import( /* webpackChunkName: "views" */ '@/views/sourceAnaly/index') + }] +}, { + path: '/equipment', + component: Layout, + redirect: '/equipment/index', + children: [{ + path: 'index', + name: '设备管理', + meta: { + i18n: 'dashboard' + }, + component: () => + import( /* webpackChunkName: "views" */ '@/views/equipment/index') }, { - path: '/dict-horizontal', - component: Layout, - redirect: '/dict-horizontal/index', - children: [{ - path: 'index', - name: '字典管理', - meta: { - i18n: 'dict' - }, - component: () => - import( /* webpackChunkName: "views" */ '@/views/util/demo/dict-horizontal') - }] + path: 'model', + name: '添加设备', + meta: { + i18n: 'dashboard' + }, + component: () => + import( /* webpackChunkName: "views" */ '@/views/equipment/model') }, { - path: '/dict-vertical', - component: Layout, - redirect: '/dict-vertical/index', - children: [{ - path: 'index', - name: '字典管理', - meta: { - i18n: 'dict' - }, - component: () => - import( /* webpackChunkName: "views" */ '@/views/util/demo/dict-vertical') - }] + path: 'warnHistory', + name: '历史报警记录', + meta: { + i18n: 'dashboard' + }, + component: () => + import( /* webpackChunkName: "views" */ '@/views/equipment/warnHistory') }, { - path: '/info', - component: Layout, - redirect: '/info/index', - children: [{ - path: 'index', - name: '个人信息', - meta: { - i18n: 'info' - }, - component: () => - import( /* webpackChunkName: "views" */ '@/views/system/userinfo') - }] + path: 'operationRecord', + name: '运维记录', + meta: { + i18n: 'dashboard' + }, + component: () => + import( /* webpackChunkName: "views" */ '@/views/equipment/operationRecord') }, { - path: '/work/process/leave', - component: Layout, - redirect: '/work/process/leave/form', - children: [{ - path: 'form/:processDefinitionId', - name: '请假流程', - meta: { - i18n: 'work' - }, - component: () => - import( /* webpackChunkName: "views" */ '@/views/work/process/leave/form') - }, { - path: 'handle/:taskId/:processInstanceId/:businessId', - name: '处理请假流程', - meta: { - i18n: 'work' - }, - component: () => - import( /* webpackChunkName: "views" */ '@/views/work/process/leave/handle') - }, { - path: 'detail/:processInstanceId/:businessId', - name: '请假流程详情', - meta: { - i18n: 'work' - }, - component: () => - import( /* webpackChunkName: "views" */ '@/views/work/process/leave/detail') - }] - }, - { - path: '/system', - component: Layout, - redirect: '/system/user', - children: [{ - path: 'user', - name: '设备管理', - meta: { - i18n: 'dashboard' - }, - component: () => - import( /* webpackChunkName: "views" */ '@/views/system/user') - },{ - path: 'systemSetting', - name: '设备管理', - meta: { - i18n: 'dashboard' - }, - component: () => - import( /* webpackChunkName: "views" */ '@/views/system/systemSetting') - }] - }, + path: 'dataRecord', + name: '设备采集数据记录', + meta: { + i18n: 'dashboard' + }, + component: () => + import( /* webpackChunkName: "views" */ '@/views/equipment/dataRecord') + }, { + path: 'waterRecord', + name: '设备采集数据记录', + meta: { + i18n: 'dashboard' + }, + component: () => + import( /* webpackChunkName: "views" */ '@/views/equipment/waterRecord') + }, { + path: 'warmRecord', + name: '设备采集数据记录', + meta: { + i18n: 'dashboard' + }, + component: () => + import( /* webpackChunkName: "views" */ '@/views/equipment/warmRecord') + }, { + path: 'doorRecord', + name: '设备采集数据记录', + meta: { + i18n: 'dashboard' + }, + component: () => + import( /* webpackChunkName: "views" */ '@/views/equipment/doorRecord') + }] +}, +{ + path: '/wel', + component: Layout, + redirect: '/wel/index', + children: [{ + path: 'index', + name: '首页', + meta: { + i18n: 'dashboard' + }, + component: () => + import( /* webpackChunkName: "views" */ '@/views/wel/index') + }, { + path: 'dashboard', + name: '控制台', + meta: { + i18n: 'dashboard', + menu: false, + }, + component: () => + import( /* webpackChunkName: "views" */ '@/views/wel/dashboard') + }] +}, { + path: '/test', + component: Layout, + redirect: '/test/index', + children: [{ + path: 'index', + name: '测试页', + meta: { + i18n: 'test' + }, + component: () => + import( /* webpackChunkName: "views" */ '@/views/util/test') + }] +}, { + path: '/dict-horizontal', + component: Layout, + redirect: '/dict-horizontal/index', + children: [{ + path: 'index', + name: '字典管理', + meta: { + i18n: 'dict' + }, + component: () => + import( /* webpackChunkName: "views" */ '@/views/util/demo/dict-horizontal') + }] +}, { + path: '/dict-vertical', + component: Layout, + redirect: '/dict-vertical/index', + children: [{ + path: 'index', + name: '字典管理', + meta: { + i18n: 'dict' + }, + component: () => + import( /* webpackChunkName: "views" */ '@/views/util/demo/dict-vertical') + }] +}, { + path: '/info', + component: Layout, + redirect: '/info/index', + children: [{ + path: 'index', + name: '个人信息', + meta: { + i18n: 'info' + }, + component: () => + import( /* webpackChunkName: "views" */ '@/views/system/userinfo') + }] +}, { + path: '/work/process/leave', + component: Layout, + redirect: '/work/process/leave/form', + children: [{ + path: 'form/:processDefinitionId', + name: '请假流程', + meta: { + i18n: 'work' + }, + component: () => + import( /* webpackChunkName: "views" */ '@/views/work/process/leave/form') + }, { + path: 'handle/:taskId/:processInstanceId/:businessId', + name: '处理请假流程', + meta: { + i18n: 'work' + }, + component: () => + import( /* webpackChunkName: "views" */ '@/views/work/process/leave/handle') + }, { + path: 'detail/:processInstanceId/:businessId', + name: '请假流程详情', + meta: { + i18n: 'work' + }, + component: () => + import( /* webpackChunkName: "views" */ '@/views/work/process/leave/detail') + }] +}, +{ + path: '/system', + component: Layout, + redirect: '/system/user', + children: [{ + path: 'user', + name: '设备管理', + meta: { + i18n: 'dashboard' + }, + component: () => + import( /* webpackChunkName: "views" */ '@/views/system/user') + }, { + path: 'systemSetting', + name: '设备管理', + meta: { + i18n: 'dashboard' + }, + component: () => + import( /* webpackChunkName: "views" */ '@/views/system/systemSetting') + }] +}, ] diff --git a/src/util/bfHelper.js b/src/util/bfHelper.js index 2bb076a..9d1339c 100644 --- a/src/util/bfHelper.js +++ b/src/util/bfHelper.js @@ -2862,12 +2862,12 @@ const loadModel = (i) => { // BimfaceLoaderConfig.APIHost = "http://10.90.100.203:8080"; BimfaceLoaderConfig.dataEnvType = BimfaceEnvOption.Local; BimfaceLoaderConfig.sdkPath = "static/jssdk@3.6.191/jssdk"; - // BimfaceLoaderConfig.path = i == 1 ? 'http://47.103.199.45:8000/face/ywq/viewToken.json' : - // 'http://47.103.199.45:8000/face/tt/viewToken.json'; - BimfaceLoaderConfig.path = - i == 1 - ? "http://10.90.100.203:8080/ywq/viewToken.json" - : "http://10.90.100.203:8080/tt/viewToken.json"; + BimfaceLoaderConfig.path = i == 1 ? 'http://47.103.199.45:8000/face/ywq/viewToken.json' : + 'http://47.103.199.45:8000/face/tt/viewToken.json'; + // BimfaceLoaderConfig.path = + // i == 1 + // ? "http://10.90.100.203:8080/ywq/viewToken.json" + // : "http://10.90.100.203:8080/tt/viewToken.json"; BimfaceSDKLoader.load(BimfaceLoaderConfig, onSDKLoadSucceeded); }; @@ -4504,7 +4504,7 @@ const lookPipeline2 = ( } // 设置视角为南侧俯视 - console.log(sbType+' - top 视角=====') + // console.log(sbType+' - top 视角=====') if (sbType == "空调" || sbType == '电' || sbType == '暖') { if (layer) { setTimeout(() => { @@ -4512,10 +4512,12 @@ const lookPipeline2 = ( setCameraStatus(sbType == "空调" ? ktCamera[tower][layer - 1] : cameraPosition[tower]); },300) } else { + console.log('ll1--2') setCameraStatus(JSON.parse(window.sessionStorage.getItem("camera"))); } // 缩放到加入选中集合的构件 } else { + console.log('ll1--') setCameraStatus(JSON.parse(window.sessionStorage.getItem("camera"))); } } diff --git a/src/views/garden/generalizePatternNew.vue b/src/views/garden/generalizePatternNew.vue new file mode 100644 index 0000000..41832d0 --- /dev/null +++ b/src/views/garden/generalizePatternNew.vue @@ -0,0 +1,3597 @@ + + + + + diff --git a/src/views/garden/home.vue b/src/views/garden/home.vue new file mode 100644 index 0000000..0a1b945 --- /dev/null +++ b/src/views/garden/home.vue @@ -0,0 +1,252 @@ + + + + + diff --git a/vue.config.js b/vue.config.js index e9d6e53..119f67d 100644 --- a/vue.config.js +++ b/vue.config.js @@ -31,8 +31,8 @@ module.exports = { // target: 'http://180.76.231.175:8000', // target: 'http://192.168.0.105:80', // target: "http://192.168.43.35", - // target: 'http://192.168.1.106', - target: "http://10.90.100.204", + target: 'http://192.168.1.106', + // target: "http://10.90.100.204", // target: "http://rsvz4t.natappfree.cc", //远程演示服务地址,可用于直接启动项目 //target: 'https://saber.bladex.vip/api', @@ -41,6 +41,10 @@ module.exports = { "^/api": "/", }, }, + "/epiHome": { + target: 'http://10.90.100.201:8093', + ws: true, + }, }, }, };