diff --git a/src/api/source/total.js b/src/api/source/total.js index 26d0d0a..7993c18 100644 --- a/src/api/source/total.js +++ b/src/api/source/total.js @@ -340,67 +340,211 @@ export const getWeather = () => { const isMock = true;//是否模拟数据 //业务区及塔台总人数 - 业务区（封闭运行） export const getAllJZByDate = (date) => { - return request({ - url: "/epiHome/getAllJZByDate", - method: "get", - params: { date }, - }); + if (isMock) { + return new Promise((reslove) => { + reslove({ + "success": true, + "message": "获取业务区以及塔台的总人数成功", + "code": 200, + "result": 220, //业务区（封闭运行）总人数 + "timestamp": 1669703332500 + }) + }) + } + else { + return request({ + url: "/epiHome/getAllJZByDate", + method: "get", + params: { date }, + }); + } }; //获取胶州机关行政人员总人数 export const getJZAdminByDate = (date) => { - return request({ - url: "/epiHome/getJZAdminByDate", - method: "get", - params: { date }, - }); + if (isMock) { + return new Promise((reslove) => { + reslove({ + "success": true, + "message": "获取胶州机关行政人员总人数成功", + "code": 200, + "result": 153, //胶州机关行政总人数 + "timestamp": 1669704319607 + }) + }) + } + else { + return request({ + url: "/epiHome/getJZAdminByDate", + method: "get", + params: { date }, + }); + } +}; +//居家总人数 +export const getAllJJByDate = (date) => { + if (isMock) { + return new Promise((reslove) => { + reslove({ + "success": true, + "message": "获取居家的总人数成功", + "code": 200, + "result": 57, //居家人数 + "timestamp": 1669703291215 + }) + }) + } + else { + return request({ + url: "/epiHome/getAllJJByDate", + method: "get", + params: { date }, + }); + } }; //在青、外地总人数 export const getIsLeaveByDate = (date) => { - return request({ - url: "/epiHome/getIsLeaveByDate", - method: "get", - params: { date }, - }); + if (isMock) { + return new Promise((reslove) => { + reslove({ + "success": true, + "message": "获取在青、在外人数成功", + "code": 200, + "result": { + "inQing": 521, //在青 + "notInQing": 21 //在外 + }, + "timestamp": 1669704274056 + }) + }) + } + else { + return request({ + url: "/epiHome/getIsLeaveByDate", + method: "get", + params: { date }, + }); + } }; //休假外出/出差人数 export const getLeaveByDate = (date) => { - return request({ - url: "/epiHome/getLeaveByDate", - method: "get", - params: { date }, - }); + if (isMock) { + return new Promise((reslove) => { + reslove({ + "success": true, + "message": "获取休假外出/出差人数成功", + "code": 200, + "result": { + "CC": 17, //出差 + "XJWC": 4 //休假外出 + }, + "timestamp": 1669704349029 + }) + }) + } + else { + return request({ + url: "/epiHome/getLeaveByDate", + method: "get", + params: { date }, + }); + } }; //备勤、居家总人数 export const getAllBQByDate = (date) => { - return request({ - url: "/epiHome/getAllBQByDate", - method: "get", - params: { date }, - }); + if (isMock) { + return new Promise((reslove) => { + reslove({ + "success": true, + "message": "获取集中备勤/居家的总人数成功", + "code": 200, + "result": { + "JJCJ": 79, //居家纯净人数 + "JZBQ": 0 //集中备勤人数 + }, + "timestamp": 1669703142436 + }) + }) + } + else { + return request({ + url: "/epiHome/getAllBQByDate", + method: "get", + params: { date }, + }); + } }; //流亭总人数 export const getAllLTByDate = (date) => { - return request({ - url: "/epiHome/getAllLTByDate", - method: "get", - params: { date }, - }); + if (isMock) { + return new Promise((reslove) => { + reslove({ + "success": true, + "message": "获取流亭的总人数成功", + "code": 200, + "result": 89, //流亭总人数 + "timestamp": 1669703368982 + }) + }) + } + else { + return request({ + url: "/epiHome/getAllLTByDate", + method: "get", + params: { date }, + }); + } }; //流亭台站总人数 export const getAllLTTZByDate = (date) => { - return request({ - url: "/epiHome/getAllLTTZByDate", - method: "get", - params: { date }, - }); + if (isMock) { + return new Promise((reslove) => { + reslove({ + "success": true, + "message": "获取流亭台站总人数成功", + "code": 200, + "result": 8, //台站总人数 + "timestamp": 1669703403651 + }) + }) + } + else { + return request({ + url: "/epiHome/getAllLTTZByDate", + method: "get", + params: { date }, + }); + } }; //集中隔离 - 获取今日健康码、行程码信息 export const getCodeByDate = (date) => { - return request({ - url: "/epiHome/epi-code/getCodeByDate", - method: "get", - params: { date }, - }); + if (isMock) { + return new Promise((reslove) => { + reslove({ + "success": true, + "message": "获取今日健康码、行程表信息成功", + "code": 200, + "result": { + "id": 2, + "createTime": "2022-11-29", + "healthYellowCode": 0, //健康码黄码 + "healthRedCode": 0, //健康码红码 + "strokeYellowCode": 0, //行程码黄码 + "strokeRedCode": 0, //行程码红码 + "jzgl": 0, //集中隔离 + "jjgl": 0, //居家隔离 + "fxts": 0 //风险提示人员 + }, + "timestamp": 1669705096367 + }) + }) + } + else { + return request({ + url: "/epiHome/epi-code/getCodeByDate", + method: "get", + params: { date }, + }); + } }; //公寓使用情况 export const getDorInfo = (date) => { diff --git a/src/components/monitoring/conditioner.vue b/src/components/monitoring/conditioner.vue index 12d473d..e1318cd 100644 --- a/src/components/monitoring/conditioner.vue +++ b/src/components/monitoring/conditioner.vue @@ -126,12 +126,12 @@ @@ -797,7 +797,8 @@ export default { this.testObject1.open = 1; var arr = bfHelper.getAll(); bfHelper.clearTags(); - if (arr.length < 2) {getOAContent + if (arr.length < 2) { + getOAContent bfHelper.customTag( { x: this.testObject1.xmove, @@ -933,7 +934,7 @@ export default { getConditionData(code).then((res) => { if (res.data.code == 200) { this.testObject1 = res.data.data; - if(this.testObject1.getConditionData == 2){ + if (this.testObject1.getConditionData == 2) { //新风不需要控制 return; } @@ -1025,11 +1026,7 @@ export default {
设备状态: ${objData.open == 1 ? "正常" : "离线"} -
-
- 所在位置: - ${objData.location} -
+ diff --git a/src/page/index/top/index.vue b/src/page/index/top/index.vue index 88ed3b4..d0f5aaa 100644 --- a/src/page/index/top/index.vue +++ b/src/page/index/top/index.vue @@ -35,11 +35,11 @@ --> - +
-
张华(建设指挥部)
-
2022-01-17
+
{{userInfo.user_name}}
+
{{currentDate}}
@@ -87,6 +87,9 @@ fullscreenToggel, listenfullscreen } from "@/util/util"; + import { + dateFormat + } from "@/util/date"; import topLock from "./top-lock"; import topMenu from "./top-menu"; import topSearch from "./top-search"; @@ -109,7 +112,9 @@ }, name: "top", data() { - return {}; + return { + currentDate: dateFormat(new Date(),'yyyy-MM-dd') + }; }, filters: {}, created() {}, @@ -182,4 +187,4 @@ .top-bar__item { font-size: 26px; } - + diff --git a/src/permission.js b/src/permission.js index b3ad5f0..d20f40f 100644 --- a/src/permission.js +++ b/src/permission.js @@ -14,6 +14,14 @@ router.beforeEach((to, from, next) => { console.log(to); if(to.path.indexOf('home') < 0){ document.documentElement.style.fontSize = ''; + }else{ + window.onresize = () => { + if(location.href.indexOf('home') < 0){ + return; + } + var dev_width = document.documentElement.clientWidth || document.body.clientWidth + document.documentElement.style.fontSize = (dev_width / 1920) * 100 + 'px' + } } const meta = to.meta || {}; const isMenu = meta.menu === undefined ? to.query.menu : meta.menu; diff --git a/src/views/equipment/index.vue b/src/views/equipment/index.vue index 8f0d7d9..8ae0608 100644 --- a/src/views/equipment/index.vue +++ b/src/views/equipment/index.vue @@ -16,12 +16,12 @@ @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">