diff --git a/components/hidden-dangers-tree/hidden-dangers-tree.vue b/components/hidden-dangers-tree/hidden-dangers-tree.vue index fe631b20..3eb60d19 100644 --- a/components/hidden-dangers-tree/hidden-dangers-tree.vue +++ b/components/hidden-dangers-tree/hidden-dangers-tree.vue @@ -399,7 +399,23 @@ this.$nextTick(() => { this._defaultSelect(range) }) - } + }, + // 查询我使用过的最近三天的三条数据 + getNewestUseRecords() { + let data = { + projectSn: this.projectSn, + } + this.sendRequest({ + url: 'xmgl/xzSecurityDangerItemRecord/getNewestUseRecords', + method: 'get', + data: { + ...data + }, + success: res => { + console.log(res.result) + } + }) + }, }, watch: { range(list) { @@ -420,7 +436,9 @@ }, }, mounted() { + this.projectSn = JSON.parse(uni.getStorageSync('projectDetail')).projectSn; this._initTree(); + this.getNewestUseRecords(); } } diff --git a/main.js b/main.js index d9769a51..e5ec1e64 100644 --- a/main.js +++ b/main.js @@ -40,8 +40,8 @@ Vue.component('uni-icons2', uniIcons2) // Vue.prototype.COMPANY = "sccr" // Vue.prototype.COMPANY = "agjt" // 鞍钢集团环境 // Vue.prototype.COMPANY = "cpgs" // 成平高速环境 -Vue.prototype.COMPANY = "xjw" // 新金湾环境 - // Vue.prototype.COMPANY = "" // 标准版 +// Vue.prototype.COMPANY = "xjw" // 新金湾环境 + Vue.prototype.COMPANY = "" // 标准版 if (process.env.NODE_ENV === 'development') { // 开发环境 console.log('开发环境') @@ -121,12 +121,12 @@ if (process.env.NODE_ENV === 'development') { // Vue.prototype.url_config = 'http://121.37.106.37:19999/'// 新能源智慧基建管理平台 // Vue.prototype.work_url = 'http://121.37.106.37:19997'// 新能源智慧基建管理平台工作流地址 - // Vue.prototype.url_config = 'http://101.43.164.214:11111/'// 百色通用 + Vue.prototype.url_config = 'http://101.43.164.214:11111/'// 百色通用 Vue.prototype.work_url = 'http://101.43.164.214:11131' // 工作流地址 通用 // Vue.prototype.url_config = 'http://101.43.164.214:11112/'// 新金湾 // Vue.prototype.work_url = 'http://101.43.164.214:11137'// 新金湾地址 通用 - Vue.prototype.url_config = 'http://jxj.zhgdyun.com:9500/' // 测试环境h5 + // Vue.prototype.url_config = 'http://jxj.zhgdyun.com:9500/' // 测试环境h5 // Vue.prototype.url_config = 'https://192.168.1.2/'// 青海中水北方 // Vue.prototype.url_config = 'http://jxj.zhgdyun.com:21000/'// 潮州项目h5 diff --git a/pages/projectEnd/safeManage/riskManageTask/riskManageTaskList.vue b/pages/projectEnd/safeManage/riskManageTask/riskManageTaskList.vue index dcaa2f4f..ff8a063b 100644 --- a/pages/projectEnd/safeManage/riskManageTask/riskManageTaskList.vue +++ b/pages/projectEnd/safeManage/riskManageTask/riskManageTaskList.vue @@ -259,6 +259,7 @@ export default { pageNo: 1, pageSize: -1, pointId: row.id, + regionIds: this.regionIds, isMySourceToDoForWorkable: 1, }; diff --git a/pages/projectEnd/safeManage/riskRanking/addRiskRanking.vue b/pages/projectEnd/safeManage/riskRanking/addRiskRanking.vue index 1761e6d8..0970dabf 100644 --- a/pages/projectEnd/safeManage/riskRanking/addRiskRanking.vue +++ b/pages/projectEnd/safeManage/riskRanking/addRiskRanking.vue @@ -1673,6 +1673,9 @@ urgentLevel: this.form.urgentLevel == 0 ? Number(this.form.urgentLevel) + 1 : this.form .urgentLevel, dangerItemContent: this.issueName, + sourceIdList: this.sourceIdList, + regionPointList: this.regionPointList, + inspectTime: this.$dayjs(this.form.inspectTime).format('YYYY-MM-DD HH:mm:ss'), }; const every = this.addForm1Rules.every(item => { if (!data[item.fieldName] || Array.isArray(this.form[item.fieldName]) && this.form[ @@ -1717,7 +1720,7 @@ console.log(data); // 安全问题 this.sendRequest({ - url: 'xmgl/xzSecurityQualityInspectionRecord/add', + url: 'xmgl/xzSecurityQualityInspectionRecord/addSecurityRecords', method: 'post', data: data, success: (res) => { @@ -1755,7 +1758,7 @@ if (this.type) data2.type = this.type console.log(data.taskId); await this.sendRequest({ - url: 'xmgl/xzSecurityQualityInspectionRecord/add', + url: 'xmgl/xzSecurityQualityInspectionRecord/addSecurityRecords', method: 'post', data: data2, success: (res) => { diff --git a/pages/projectEnd/safeManage/riskRanking/addUnconstructed.vue b/pages/projectEnd/safeManage/riskRanking/addUnconstructed.vue index a2eb9d25..e038dd83 100644 --- a/pages/projectEnd/safeManage/riskRanking/addUnconstructed.vue +++ b/pages/projectEnd/safeManage/riskRanking/addUnconstructed.vue @@ -545,6 +545,9 @@ workTicketAttachment: JSON.stringify(this.implementationPhoto), projectSn: this.projectDetail.projectSn, policeCameraIds: this.selectList.join(','), + // inspector: this.userInfo.userId, + inspector: this.userInfo.realName, + }; if(this.regionPointList.length > 0){ data.regionPointList = this.regionPointList; diff --git a/pages/projectEnd/safeManage/riskRanking/createRiskRankingList.vue b/pages/projectEnd/safeManage/riskRanking/createRiskRankingList.vue index efe95da2..6f226d82 100644 --- a/pages/projectEnd/safeManage/riskRanking/createRiskRankingList.vue +++ b/pages/projectEnd/safeManage/riskRanking/createRiskRankingList.vue @@ -384,11 +384,16 @@ checkPeriodName: "半年", }, ], + regionIds:"", + checkPeriod: "", } }, onLoad(opts) { this.projectDetail = JSON.parse(uni.getStorageSync('projectDetail')); this.pointId = opts.id; + this.regionIds = opts.regionIds; + this.checkPeriod = opts.checkPeriod; + this.getQualityRegionListFn(); this.getDicProjectTypeList(); this.getRiskListLibraryList(); @@ -717,7 +722,7 @@ pageNo: this.pageNo, pageSize: this.pageSize, projectType: this.projectTypeId, - regionIds: this.searchInfo.regionIds, + // regionIds: this.searchInfo.regionIds, containLibraryIds: this.searchInfo.containLibraryIds, projectSn: this.projectDetail.projectSn, dynamicType: this.current + 1, @@ -725,6 +730,8 @@ riskLevel: this.policeCameraInfo.riskLevel, specificResponsibilityAreaIds: this.searchInfo.specificResponsibilityAreaIds, isMySourceToDo: 1, + regionIds: this.regionIds, + checkPeriod: this.checkPeriod, } this.sendRequest({ diff --git a/pages/projectEnd/safeManage/riskRanking/riskRankingList.vue b/pages/projectEnd/safeManage/riskRanking/riskRankingList.vue index 16a8ea57..fd01ce56 100644 --- a/pages/projectEnd/safeManage/riskRanking/riskRankingList.vue +++ b/pages/projectEnd/safeManage/riskRanking/riskRankingList.vue @@ -233,6 +233,7 @@ pageSize: -1, isMySourceToDo: 1, regionIds: row.id, + checkPeriod: this.current + 1, } this.sendRequest({ @@ -269,7 +270,7 @@ regionIds: this.regionIds }] uni.navigateTo({ - url: `./addRiskRanking?typeId=${type}®ionPointList=${JSON.stringify(dataList)}&type=add` + url: `./addRiskRanking?typeId=${type}®ionPointList=${JSON.stringify(dataList)}&type=add&sourceIdList=${JSON.stringify(ele.hazardSourceNumberTodoIdList)}` }) } else if (type == 2) { const dataList = [{ @@ -277,7 +278,7 @@ regionId: this.regionIds }] uni.navigateTo({ - url: `./addUnconstructed?regionPointList=${JSON.stringify(dataList)}` + url: `./addUnconstructed?regionPointList=${JSON.stringify(dataList)}&sourceIdList=${JSON.stringify(ele.hazardSourceNumberTodoIdList)}` }) } else if (type == 4) { const resultList = this.riskListPointList.filter(item => item.checked); @@ -300,7 +301,7 @@ return } uni.navigateTo({ - url: `./createRiskRankingList?id=${ele.id}` + url: `./createRiskRankingList?id=${ele.id}®ionIds=${this.regionIds}&checkPeriod=${this.current + 1}` }) } }, diff --git a/pages/projectEnd/safeSame/hiddenTroubleComponents/addHazardousWorkDistribution.vue b/pages/projectEnd/safeSame/hiddenTroubleComponents/addHazardousWorkDistribution.vue index 23c86281..17e44c5b 100644 --- a/pages/projectEnd/safeSame/hiddenTroubleComponents/addHazardousWorkDistribution.vue +++ b/pages/projectEnd/safeSame/hiddenTroubleComponents/addHazardousWorkDistribution.vue @@ -373,6 +373,9 @@ + +