admin/zhgdyunapp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

flx:修复bug

Browse Source
This commit is contained in:
Rain_ 2025-08-30 11:31:27 +08:00
parent a46d57381c
commit df8e65e20c
8 changed files with 47 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
components/hidden-dangers-tree/hidden-dangers-tree.vue
View File

@ -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();
}
}
</script>

8
main.js
View File

@ -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

1
pages/projectEnd/safeManage/riskManageTask/riskManageTaskList.vue
View File

@ -259,6 +259,7 @@ export default {
pageNo: 1,
pageSize: -1,
pointId: row.id,
regionIds: this.regionIds,
isMySourceToDoForWorkable: 1,
};

7
pages/projectEnd/safeManage/riskRanking/addRiskRanking.vue
View File

@ -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) => {

3
pages/projectEnd/safeManage/riskRanking/addUnconstructed.vue
View File

@ -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;

9
pages/projectEnd/safeManage/riskRanking/createRiskRankingList.vue
View File

@ -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({

7
pages/projectEnd/safeManage/riskRanking/riskRankingList.vue
View File

@ -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}&regionPointList=${JSON.stringify(dataList)}&type=add`
url: `./addRiskRanking?typeId=${type}&regionPointList=${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}&regionIds=${this.regionIds}&checkPeriod=${this.current + 1}`
})
}
},

3
pages/projectEnd/safeSame/hiddenTroubleComponents/addHazardousWorkDistribution.vue
View File

@ -373,6 +373,9 @@
<!-- 问题分类hiddenDangersTree -->
<tki-tree ref="issueTree" @confirm="(val)=>checkPointBtn(val,2)" search idKey='id' :range="issueList"
rangeKey="dangerName" confirmColor="#4e8af7" />
<!-- <hiddenDangersTree ref="issueTree" @confirm="(val)=>checkPointBtn(val,2)" search idKey='id' :range="issueList"
rangeKey="dangerName" confirmColor="#4e8af7" /> -->
<!-- 通知人 -->
<tki-tree ref="informTree" :multiple="true" @confirm="(val)=>checkPointBtn(val,3)" idKey='id'
:range="personList" rangeKey="workerName" confirmColor="#4e8af7" />