From 4f993ce7545eb2b1b5e6c877e4c2d5b799e4bbb3 Mon Sep 17 00:00:00 2001 From: cclu <1106109051@qq.com> Date: Thu, 3 Apr 2025 18:55:21 +0800 Subject: [PATCH] first commit --- pages/mbwa/mbwa.vue | 277 +++++++++++++++++------------ pages/walkAroundManager/detail.vue | 10 +- pages/walkAroundManager/index.vue | 32 +++- util/apiPath.js | 5 +- 4 files changed, 194 insertions(+), 130 deletions(-) diff --git a/pages/mbwa/mbwa.vue b/pages/mbwa/mbwa.vue index 11a2ee0..eb57510 100644 --- a/pages/mbwa/mbwa.vue +++ b/pages/mbwa/mbwa.vue @@ -10,146 +10,189 @@ --> - + :nameStyle="selectFilter == item.id ? 'color:#5B96E9' : 'color:#808D97'" + :imageBoxStyle=" + (selectFilter == item.id + ? 'background:#f0f7fe;' + : 'background:#f6f7f8;') + + 'height:75rpx;width:75rpx;padding: 18rpx;' + " + @handleClick="handleChangeSelect(item.id)" + > - + - +
{{ index + 1 }}
{{ item.template.title || "-" }} - + {{ - item.extendObj.errorStatus === 0 - ? "待处理" - : item.extendObj.errorStatus === 1 - ? "处理中" - : item.extendObj.errorStatus === 2 - ? "已处理" - : "" - }} + item.extendObj.errorStatus === 0 + ? "待处理" + : item.extendObj.errorStatus === 1 + ? "处理中" + : item.extendObj.errorStatus === 2 + ? "已处理" + : "" + }} - {{ - item.extendObj.uploadResult || "-" - }} - + {{ item.extendObj.uploadResult || "-" }} - {{ - item.extendObj.situation === 0 - ? "正常情况" - : item.extendObj.situation === 1 - ? "急需处理" - : "-" - }} + {{ + item.extendObj.errorStatus === 2 + ? "" + : item.extendObj.situation === 0 + ? "正常情况" + : item.extendObj.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.extendObj.errorStatus === 0 - ? "待处理" - : item.extendObj.errorStatus === 1 - ? "处理中" - : item.extendObj.errorStatus === 2 - ? "已处理" - : "" - }} + item.extendObj.errorStatus === 0 + ? "待处理" + : item.extendObj.errorStatus === 1 + ? "处理中" + : item.extendObj.errorStatus === 2 + ? "已处理" + : "" + }} - {{ - item.extendObj.situation === 0 - ? "正常情况" - : item.extendObj.situation === 1 - ? "急需处理" - : "-" - }} + {{ + item.extendObj.situation === 0 + ? "正常情况" + : item.extendObj.situation === 1 + ? "急需处理" + : "-" + }} {{ - item.extendObj.uploadResult || "-" - }} + item.extendObj.uploadResult || "-" + }} {{ 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") + : "-" + }} @@ -158,7 +201,7 @@ {{ !isEnd ? "正在加载,请稍后..." : "——— 我是有底线的 ———" - }} + }} @@ -297,28 +340,28 @@ export default { this.selectFilter === 1 ? undefined : 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 + }, + ] + : undefined, // any: // this.selectFilter === 4 @@ -469,7 +512,7 @@ export default { padding: 16rpx; margin: 24rpx 0; border-radius: 8rpx; - box-shadow: 0 0px 6rpx #E2E2E2; + box-shadow: 0 0px 6rpx #e2e2e2; position: relative; .content-index { @@ -483,7 +526,7 @@ export default { position: absolute; top: 26rpx; left: -4rpx; - box-shadow: 4rpx 4rpx 2rpx 0 rgba(238, 112, 27, 0.5) + box-shadow: 4rpx 4rpx 2rpx 0 rgba(238, 112, 27, 0.5); } .itemRow { @@ -560,8 +603,6 @@ export default { text-overflow: ellipsis; text-align: center; } - - } .line { diff --git a/pages/walkAroundManager/detail.vue b/pages/walkAroundManager/detail.vue index 6ff7cd7..11484fd 100644 --- a/pages/walkAroundManager/detail.vue +++ b/pages/walkAroundManager/detail.vue @@ -1187,7 +1187,8 @@ export default { }); uni.uploadFile({ // url: "https://user.eshangtech.com/Coop.Merchant/Handler/handler_ajax.ashx?action_type=UploadFile&folder=MBWA", - url: "https://es.robot-z.cn/oss/upload", + // url: "https://es.robot-z.cn/oss/upload", + url:"https://es.eshangtech.com/oss/upload", filePath: res.tempFilePath, header: { "Content-Type": "multipart/form-data", @@ -1204,7 +1205,7 @@ export default { console.log("data", data); uni.hideLoading(); _this.feedbackImgList.push( - `https://es.robot-z.cn/${data.data.path}` + `https://es.eshangtech.com/${data.data.path}` ); }, fail(error) { @@ -1224,7 +1225,8 @@ export default { }); uni.uploadFile({ // url: "https://user.eshangtech.com/Coop.Merchant/Handler/handler_ajax.ashx?action_type=UploadFile&folder=MBWA", - url: "https://es.robot-z.cn/oss/upload", + // url: "https://es.robot-z.cn/oss/upload", + url:"https://es.eshangtech.com/oss/upload", filePath: rs.tempFilePaths[0], fileType: "image", header: { @@ -1240,7 +1242,7 @@ export default { console.log("data", data); uni.hideLoading(); _this.feedbackImgList.push( - `https://es.robot-z.cn/${data.data.path}` + `https://es.eshangtech.com/${data.data.path}` ); // path; }, diff --git a/pages/walkAroundManager/index.vue b/pages/walkAroundManager/index.vue index 8530838..c47e0b4 100644 --- a/pages/walkAroundManager/index.vue +++ b/pages/walkAroundManager/index.vue @@ -37,7 +37,11 @@
- + × - +
@@ -837,7 +845,8 @@ export default { }); uni.uploadFile({ // url: "https://user.eshangtech.com/Coop.Merchant/Handler/handler_ajax.ashx?action_type=UploadFile&folder=MBWA", - url: "https://es.robot-z.cn/oss/upload", + // url: "https://es.robot-z.cn/oss/upload", + url: "https://es.eshangtech.com/oss/upload", filePath: res.tempFilePath, header: { "Content-Type": "multipart/form-data", @@ -854,7 +863,7 @@ export default { console.log("data", data); uni.hideLoading(); _this.imgsList.push( - `https://es.robot-z.cn/${data.data.path}` + `https://es.eshangtech.com/${data.data.path}` ); }, fail(error) { @@ -874,7 +883,8 @@ export default { }); uni.uploadFile({ // url: "https://user.eshangtech.com/Coop.Merchant/Handler/handler_ajax.ashx?action_type=UploadFile&folder=MBWA", - url: "https://es.robot-z.cn/oss/upload", + // url: "https://es.robot-z.cn/oss/upload", + url: "https://es.eshangtech.com/oss/upload", filePath: rs.tempFilePaths[0], fileType: "image", header: { @@ -889,7 +899,9 @@ export default { } console.log("data", data); uni.hideLoading(); - _this.imgsList.push(`https://es.robot-z.cn/${data.data.path}`); + _this.imgsList.push( + `https://es.eshangtech.com/${data.data.path}` + ); // path; }, fail(error) { @@ -988,6 +1000,14 @@ export default { this.$forceUpdate(); } }, + showImg2(index, imgList) { + uni.previewImage({ + urls: imgList, + current: index, + loop: true, + indicator: "number", + }); + }, // 修改情况类型 handleChangeSituationType(e) { diff --git a/util/apiPath.js b/util/apiPath.js index e1255c5..773c518 100644 --- a/util/apiPath.js +++ b/util/apiPath.js @@ -2,7 +2,7 @@ * @Author: cclu 1106109051@qq.com * @Date: 2023-05-16 09:06:13 * @LastEditors: cclu 1106109051@qq.com - * @LastEditTime: 2025-03-19 11:20:27 + * @LastEditTime: 2025-03-27 15:45:03 * @FilePath: \wechat_yxcl\util\apiPath.js * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ @@ -18,7 +18,8 @@ export default { // apiurl: 'https://erysfeipeng.oicp.net/', // web api testApiurl: 'http://dev.eshangtech.com:8001/', // web api测试接口地址 - NodeApiurl: 'https://es.robot-z.cn/', // web api测试接口地址 + // NodeApiurl: 'https://es.robot-z.cn/', // web api测试接口地址 + NodeApiurl: 'https://es.eshangtech.com/', // web api测试接口地址 // NodeApiurl: 'http://home.robot-z.cn:7001/', mobUrl: 'http://192.168.11.125:8000/Coop.Merchant/Handler/handler_ajax.ashx', // 接口 testURL1: 'http://192.168.10.123:8000', // 测试ip