diff --git a/package.json b/package.json index 5a12f43..e918f35 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,8 @@ "vue-pdf": "^4.3.0", "vue-router": "^3.5.1", "vue-seamless-scroll": "^1.1.23", - "vuex": "^3.6.2" + "vuex": "^3.6.2", + "xe-utils": "^3.5.14" }, "devDependencies": { "@babel/core": "^7.12.16", diff --git a/src/api/realTimeMonitor.js b/src/api/realTimeMonitor.js index 5d519f4..41fc31d 100644 --- a/src/api/realTimeMonitor.js +++ b/src/api/realTimeMonitor.js @@ -24,7 +24,7 @@ export function msg(params) { // 4.月度计划 export function ydjh(params) { return request({ - url: "/kban/ydjh", + url: "/dmSygdMx/list", method: "get", params, }); @@ -66,3 +66,11 @@ export function zxqwcqk(params) { params, }); } + +export function getPerson(data={}) { + return request({ + url: "/dmBzry/getList", + method: "post", + data, + }); +} diff --git a/src/components/RealTimeMonitor/index.vue b/src/components/RealTimeMonitor/index.vue index ed04867..51f68dd 100644 --- a/src/components/RealTimeMonitor/index.vue +++ b/src/components/RealTimeMonitor/index.vue @@ -157,10 +157,10 @@ - + - + { + this.personList=res.data + console.log(res.data) + this.zxqZxDetail(); //7.作业区执行情况 + }) + }, headerRowClass() { return "background:#072e7d;color:#fff;fontSize:12px; fontWeight: 400; textAlign: center;"; }, @@ -495,7 +513,12 @@ export default { }, // 4.月度计划 ydjh() { - ydjh().then((res) => { + const date=new Date() + const data={ + begin:'2024/12/01', + end:'2024/12/31' + } + ydjh(data).then((res) => { this.monthlyTableData = res.data; }); }, @@ -548,7 +571,7 @@ export default { tzbh: item.tzbh, gx: item.gx, compAt: item.compAt, - name: item.name, + name: this.formatName(item.name), }); }); let valueArray = data.map((obj) => Object.values(obj));