From 76e162abd49a9a892817ef2f3d6536467aacfa43 Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Thu, 19 Jun 2025 15:10:30 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/project.js | 13 +++++- config.js | 13 +++--- manifest.json | 1 + pages/delayRectificationApproval/index.vue | 2 +- .../index.vue | 2 +- pages/newProject/index.vue | 4 +- pages/randomlySnapPicture/addSnapPhoto.vue | 46 +++++++++++++------ pages/randomlySnapPicture/index.vue | 20 +++++--- .../violationManagenment/violationPenalty.vue | 2 +- 9 files changed, 71 insertions(+), 32 deletions(-) diff --git a/api/project.js b/api/project.js index 2bada28..d92bfaa 100644 --- a/api/project.js +++ b/api/project.js @@ -74,9 +74,18 @@ export function getDictTableOption(data = {}) { } // 监理单位-下拉 +// export function selectSupervisionUnit(data = {}) { +// return request({ +// url: '/system/select/selectSupervisionUnit', +// method: 'post', +// data +// }) +// } + +// 2025-3-4 更换接口 原接口无数据 已同步与web端一致 export function selectSupervisionUnit(data = {}) { return request({ - url: '/system/select/selectSupervisionUnit', + url: '/system/select/selectSupervisionUnitUser', method: 'post', data }) @@ -516,7 +525,7 @@ export function checkIsExistProName(data) { export function getQxToken() { return request({ url: '/schedule/job/getQxToken', - method: 'get', + method: 'get' }) } diff --git a/config.js b/config.js index d9215d8..102e938 100644 --- a/config.js +++ b/config.js @@ -1,17 +1,18 @@ // 应用全局配置 module.exports = { // baseUrl: 'https://vue.ruoyi.vip/prod-api', - baseUrl: 'http://218.21.27.6:1999/nxdt-api', // 正式环境 - // baseUrl: 'http://192.168.0.14:21626/prod-api', // 测试环境 + // baseUrl: 'http://218.21.27.6:1999/prod-api', // 正式环境 + baseUrl: 'http://192.168.0.14:21626/nxdt-api', // 测试环境 + // baseUrl: 'http://192.168.0.60:18080', // 赵福海 // baseUrl: 'http://192.168.0.58:19090', // 杰 // baseUrl: 'http://192.168.0.176:18080', // 强 // baseUrl: 'http://192.168.0.38:18080', // 强 - // fileUrl: 'http://192.168.0.14:21626/file/statics/', // 测试环境 - // fileUrl2: 'http://192.168.0.14:21626/file/statics', // 测试环境 + fileUrl: 'http://192.168.0.14:21626/file/statics/', // 测试环境 + fileUrl2: 'http://192.168.0.14:21626/file/statics', // 测试环境 // 课件: 文件视频路径 coursewareUrl: 'http://192.168.0.14:9090/nxdt-courseware', - fileUrl: 'http://218.21.27.6:1999/file/statics/', // 产线环境 - fileUrl2: 'http://218.21.27.6:1999/file/statics', // 产线环境 + // fileUrl: 'http://218.21.27.6:1999/file/statics/', // 产线环境 + // fileUrl2: 'http://218.21.27.6:1999/file/statics', // 产线环境 // baseUrl: 'http://localhost:8080', // 应用信息 appInfo: { diff --git a/manifest.json b/manifest.json index 69c46fc..f882625 100644 --- a/manifest.json +++ b/manifest.json @@ -5,6 +5,7 @@ "versionName" : "1.1.0", "versionCode" : "100", "transformPx" : false, + "sassImplementationName" : "node-sass", "app-plus" : { "usingComponents" : true, "nvueCompiler" : "uni-app", diff --git a/pages/delayRectificationApproval/index.vue b/pages/delayRectificationApproval/index.vue index 667de12..59548ff 100644 --- a/pages/delayRectificationApproval/index.vue +++ b/pages/delayRectificationApproval/index.vue @@ -22,7 +22,7 @@
查看
- + 审批
diff --git a/pages/hiddenDangerRectificationApproval/index.vue b/pages/hiddenDangerRectificationApproval/index.vue index 2a4d6fd..b0f8581 100644 --- a/pages/hiddenDangerRectificationApproval/index.vue +++ b/pages/hiddenDangerRectificationApproval/index.vue @@ -22,7 +22,7 @@
查看
- + 审批
diff --git a/pages/newProject/index.vue b/pages/newProject/index.vue index 0bc82bc..9998b94 100644 --- a/pages/newProject/index.vue +++ b/pages/newProject/index.vue @@ -9,7 +9,9 @@ 工程基本信息
-
+
+ +
diff --git a/pages/randomlySnapPicture/addSnapPhoto.vue b/pages/randomlySnapPicture/addSnapPhoto.vue index 4970573..69123a4 100644 --- a/pages/randomlySnapPicture/addSnapPhoto.vue +++ b/pages/randomlySnapPicture/addSnapPhoto.vue @@ -18,14 +18,20 @@ isLink :label="formData.proName ? '' : '请选择工程名称'" @click="showPicker1 = true" - :disabled="opt.type === 'view'" + :disabled="opt.pageType === 'view'" > - + - + - - 提交 - - + 提交 + 转违章 - + 转隐患 @@ -87,8 +103,8 @@ export default { proOptions: [], rules: { proName: { required: true, message: '请输入检查标题', trigger: ['blur'] }, - description: [{ required: true, message: '请输入问题描述', trigger: ['blur', 'change'] }], - }, + description: [{ required: true, message: '请输入问题描述', trigger: ['blur', 'change'] }] + } } }, onLoad(opt) { @@ -96,10 +112,12 @@ export default { console.log('🚀 ~ onLoad ~ this.opt:', this.opt) this.token = uni.getStorageSync('App-Token') this.getProOptions() - if (this.opt.type === 'edit' || this.opt.type === 'view') { + if (this.opt.pageType === 'edit' || this.opt.pageType === 'view') { this.formData = this.opt this.formData.photoList.forEach(item => { item.filePath = item.url = config.fileUrl + item.filePath + + console.log(item.filePath, '************', item.url) }) } }, @@ -200,7 +218,7 @@ export default { async submit() { console.log('🚀 ~ submit ~ this.formData:', this.formData) try { - if (this.opt.type === 'edit') { + if (this.opt.pageType === 'edit') { this.formData.id = this.opt.id } const res = await addSnapshotForm(this.formData) @@ -221,7 +239,7 @@ export default { let code = type === 2 ? '违章' : '隐患' const res = updateSnapshotStatus({ snapshotId: this.opt.snapshotId, status: type }) uni.showToast({ - title: '转' + code + '成功', + title: '转' + code + '成功', icon: 'success', duration: 1500 }) diff --git a/pages/randomlySnapPicture/index.vue b/pages/randomlySnapPicture/index.vue index 8a13633..140dffb 100644 --- a/pages/randomlySnapPicture/index.vue +++ b/pages/randomlySnapPicture/index.vue @@ -19,9 +19,17 @@
问题描述：{{ item.description }}
状态：{{ item.status }}
-
查看
-
编辑
- +
+ + 查看 + +
+
+ + 编辑 + +
+
@@ -54,7 +62,7 @@ export default { chickIcon() { console.log('🚀 ~ 点击右侧按钮chickIcon') const params = { - type: 'add', + type: 'add' } uni.navigateTo({ url: '/pages/randomlySnapPicture/addSnapPhoto?params=' + JSON.stringify(params) @@ -79,9 +87,9 @@ export default { console.log('🚀 ~ 查看编辑 ~ item:', item) let params = {} if (type === 1) { - params = { type: 'view', ...item } + params = { pageType: 'view', ...item } } else if (type === 2) { - params = { type: 'edit', ...item } + params = { pageType: 'edit', ...item } } uni.navigateTo({ url: '/pages/randomlySnapPicture/addSnapPhoto?params=' + JSON.stringify(params) diff --git a/pages/violationManagenment/violationPenalty.vue b/pages/violationManagenment/violationPenalty.vue index c78afc1..ed53414 100644 --- a/pages/violationManagenment/violationPenalty.vue +++ b/pages/violationManagenment/violationPenalty.vue @@ -21,7 +21,7 @@
查看
- + 审批