diff --git a/pages/mbwa/mbwa.vue b/pages/mbwa/mbwa.vue index eb57510..57aa1fb 100644 --- a/pages/mbwa/mbwa.vue +++ b/pages/mbwa/mbwa.vue @@ -10,180 +10,137 @@ --> - + " @handleClick="handleChangeSelect(item.id)"> - + - +
{{ index + 1 }}
{{ item.template.title || "-" }} - + : item.errorStatus === 2 + ? '#139942' + : '', + }"> {{ - item.extendObj.errorStatus === 0 + item.errorStatus === 0 ? "待处理" - : item.extendObj.errorStatus === 1 - ? "处理中" - : item.extendObj.errorStatus === 2 - ? "已处理" - : "" - }} + : item.errorStatus === 1 + ? "处理中" + : item.errorStatus === 2 + ? "已处理" + : "" + }}
- {{ item.extendObj.uploadResult || "-" }} + {{ item.uploadResult || "-" }} - {{ - item.extendObj.errorStatus === 2 - ? "" - : item.extendObj.situation === 0 - ? "正常情况" - : item.extendObj.situation === 1 + {{ + item.errorStatus === 2 + ? "" + : item.situation === 0 + ? "正常情况" + : item.situation === 1 ? "急需处理" : "-" - }} + }} - {{ item.userName || "-" }} + {{ item.userName || "-" }} - {{ - item.createdAt - ? $moment(item.createdAt).format("YYYY-MM-DD HH:mm:ss") - : "-" - }} + {{ + item.createdAt + ? $moment(item.createdAt).format("YYYY-MM-DD HH:mm:ss") + : "-" + }}
- + {{ item.template.title || "-" }} - + : item.errorStatus === 2 + ? '#139942' + : '', + }"> {{ - item.extendObj.errorStatus === 0 + item.errorStatus === 0 ? "待处理" - : item.extendObj.errorStatus === 1 - ? "处理中" - : item.extendObj.errorStatus === 2 - ? "已处理" - : "" + : item.errorStatus === 1 + ? "处理中" + : item.errorStatus === 2 + ? "已处理" + : "" }} - {{ - item.extendObj.situation === 0 - ? "正常情况" - : item.extendObj.situation === 1 + }">{{ + item.situation === 0 + ? "正常情况" + : item.situation === 1 ? "急需处理" : "-" - }} + }} {{ - item.extendObj.uploadResult || "-" + item.uploadResult || "-" }} @@ -275,12 +232,12 @@ export default { handleGoDetail(obj) { console.log("obj", obj); // 判断是否是异常的 - if (obj.extendObj.situation === 1) { + if (obj.situation === 1) { this.$util.toNextRoute( "navigateTo", `/pages/walkAroundManager/detail?id=${obj.id}&pageType=error` ); - } else if (obj.extendObj.situation === 0) { + } else if (obj.situation === 0) { // 正常的 查看详情 this.$util.toNextRoute( "navigateTo", @@ -328,40 +285,40 @@ export default { title: "加载中...", }); const req = { - serverPartId: undefined, - startTime: undefined, - endTime: undefined, - page: this.PageIndex, + // serverPartId: 0, + startTime: "", + endTime: "", + pageNum: this.PageIndex, pageSize: 10, // serverPartId: this.selectServiceList[this.selectIndex].value, // startTime: `${this.searchTime} 00:00:00`, // endTime: `${this.searchTime} 23:59:59`, extend: this.selectFilter === 1 - ? undefined + ? null : this.selectFilter === 2 - ? [ + ? [ { key: "situation", value: 0, }, ] - : this.selectFilter === 3 - ? [ - { - key: "situation", - value: 1, - }, - ] - : this.selectFilter === 4 - ? [ - { - key: "person.STAFF_NAME", - value: this.useInfo.userData.UserName, - // this.useInfo.userData.UserId - }, - ] - : undefined, + : this.selectFilter === 3 + ? [ + { + key: "situation", + value: 1, + }, + ] + : this.selectFilter === 4 + ? [ + { + key: "person.STAFF_NAME", + value: this.useInfo.userData.UserName, + // this.useInfo.userData.UserId + }, + ] + : null, // any: // this.selectFilter === 4 @@ -383,23 +340,24 @@ export default { }; console.log("req", req); - const data = await this.$request.$webNodePOST( - `questionnaire-responses/search/many`, + const data = await this.$request.$webJavaPOST( + `questionnaire-responses/getList`, req ); - let list = data.data; + console.log("datadatadatadata", data); + let list = data.Result_Data.List; if (list && list.length > 0) { if (list.length < 10) { this.isEnd = true; } - list.forEach((item) => { - let extendObj = {}; - if (item.extend) { - extendObj = JSON.parse(item.extend); - } - item.extendObj = extendObj; - }); + // list.forEach((item) => { + // let extendObj = {}; + // if (item.extend) { + // extendObj = JSON.parse(item.extend); + // } + // item.extendObj = extendObj; + // }); } else { this.isEnd = true; } diff --git a/pages/walkAroundManager/detail.vue b/pages/walkAroundManager/detail.vue index 196e28d..923b302 100644 --- a/pages/walkAroundManager/detail.vue +++ b/pages/walkAroundManager/detail.vue @@ -1,43 +1,35 @@