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

fix: BUG修改

Browse Source
This commit is contained in:
kun 2024-04-28 09:09:41 +08:00
parent c0dc4cf7c2
commit a8d3ffb041
11 changed files with 136 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
main.js
View File

@ -79,10 +79,12 @@ if (process.env.NODE_ENV === 'development') {
console.log('生产环境') console.log('生产环境')
// Vue.prototype.url_config = 'http://10.168.1.105:11111/' // 线上地址 // Vue.prototype.url_config = 'http://10.168.1.105:11111/' // 线上地址
// Vue.prototype.url_config = 'http://10.168.1.104:11111/' // 线上地址 // Vue.prototype.url_config = 'http://10.168.1.104:11111/' // 线上地址
Vue.prototype.url_config = 'http://47.93.215.234:9809/' // 鞍钢线上地址 // Vue.prototype.url_config = 'http://47.93.215.234:9809/' // 鞍钢线上地址
Vue.prototype.url_config = 'http://47.93.215.234:11211/' // 鞍钢测试地址
// Vue.prototype.url_config = 'http://182.90.224.237:51234/' // 百色三标段 // Vue.prototype.url_config = 'http://182.90.224.237:51234/' // 百色三标段
// Vue.prototype.url_config = 'http://192.168.34.221:9111/' // 百色三标段 // Vue.prototype.url_config = 'http://192.168.34.221:9111/' // 百色三标段
Vue.prototype.work_url = 'http://47.93.215.234:19997' // 工作流线上地址 // Vue.prototype.work_url = 'http://47.93.215.234:19997' // 工作流线上地址
Vue.prototype.work_url = 'http://47.93.215.234:19097' // 工作流测试地址
// Vue.prototype.work_url = 'http://192.168.34.139:5173' // 工作流地址 // Vue.prototype.work_url = 'http://192.168.34.139:5173' // 工作流地址
// Vue.prototype.url_config = 'http://182.90.224.147:100/' //演示平台 // Vue.prototype.url_config = 'http://182.90.224.147:100/' //演示平台
// Vue.prototype.url_config ='http://124.71.178.44:8012/' // 河南 // Vue.prototype.url_config ='http://124.71.178.44:8012/' // 河南

211
pages/projectEnd/safeManage/addExamine.vue
View File

@ -50,12 +50,12 @@
</view> </view>
</view> </view>
<!-- <view class="b-bottom" v-if="addForm.status != 1"> --> <!-- <view class="b-bottom" v-if="addForm.status != 1"> -->
<view class="b-bottom"> <view class="b-bottom">
<view class="form-item flex"> <view class="form-item flex">
<!-- <view class="form-lable"><text>检查时间</text></view> --> <!-- <view class="form-lable"><text>检查时间</text></view> -->
<view class="form-lable">*<text>检查时间</text></view> <view class="form-lable">*<text>检查时间</text></view>
<!-- <picker class="form-content" :disabled="isDisabled" mode="date" :value="addForm.inspectTime" <!-- <picker class="form-content" :disabled="isDisabled" mode="date" :value="addForm.inspectTime"
:start="startDate" @change="bindCheckDateChange"> :start="startDate" @change="bindCheckDateChange">
<view class="uni-input"> <view class="uni-input">
<text class="uni-input2" v-if="addForm.inspectTime ===''">请选择检查时间</text> <text class="uni-input2" v-if="addForm.inspectTime ===''">请选择检查时间</text>
@ -63,17 +63,16 @@
<uni-icons v-if="!isDisabled" type="arrowright" color="#6C7178" /> <uni-icons v-if="!isDisabled" type="arrowright" color="#6C7178" />
</view> </view>
</picker> --> </picker> -->
<dateTimePicker :placeholder="'请选择检查时间'" :disabled="isDisabled" <dateTimePicker :placeholder="'请选择检查时间'" :disabled="isDisabled" :start="startTime"
:start="startTime" :fields="'minute'" :default-value="addForm.inspectTime" :fields="'minute'" :default-value="addForm.inspectTime"
@change="bindPickerChange($event,'startTime')" @change="bindPickerChange($event,'startTime')" class="form-content">
class="form-content"> <view class="uni-input">
<view class="uni-input"> <!-- <text>{{addForm.inspectTime}}</text> -->
<!-- <text>{{addForm.inspectTime}}</text> --> <uni-icons v-if="!isDisabled" type="arrowright" color="#6C7178" />
<uni-icons v-if="!isDisabled" type="arrowright" color="#6C7178" /> </view>
</view> </dateTimePicker>
</dateTimePicker> </view>
</view> </view>
</view>
<view class="b-bottom" v-if="addForm.status != 1"> <view class="b-bottom" v-if="addForm.status != 1">
<view class="form-item flex"> <view class="form-item flex">
@ -138,7 +137,8 @@
</view> </view>
<view class="uni-input uni-select flex2" v-else> <view class="uni-input uni-select flex2" v-else>
<view style="width: 98%;white-space: nowrap;" class="ellipsis"> <view style="width: 98%;white-space: nowrap;" class="ellipsis">
{{hiddenDangerInspectRegionName }}</view> {{hiddenDangerInspectRegionName }}
</view>
</view> </view>
</picker> </picker>
</view> </view>
@ -156,6 +156,18 @@
</view> </view>
</view> </view>
<view class="b-bottom" v-if="addForm.status != 1">
<view class="form-item flex">
<view class="form-lable">*<text>整改单位</text></view>
<picker class="form-content" :disabled="isDisabled" :value="addForm.dutyUnit"
range-key="enterpriseName" :range="dutyUnitList" @change="bindDutyUnit">
<view class="uni-input" :class="{'noCheck': !addForm.dutyUnit.toString()}">
{{addForm.dutyUnit.toString() ? dutyUnitList[addForm.dutyUnit].enterpriseName : "请选择整改单位"}}
<uni-icons v-if="!isDisabled" type="arrowright" color="#6C7178" />
</view>
</picker>
</view>
</view>
<view class="b-bottom" v-if="addForm.status != 1"> <view class="b-bottom" v-if="addForm.status != 1">
<view class="form-item flex"> <view class="form-item flex">
<view class="form-lable">*<text>整改责任人</text></view> <view class="form-lable">*<text>整改责任人</text></view>
@ -169,20 +181,6 @@
</view> </view>
</view> </view>
<view class="b-bottom" v-if="addForm.status != 1">
<view class="form-item flex">
<view class="form-lable"><text>整改单位</text></view>
<picker class="form-content" :disabled="isDisabled" :value="addForm.dutyUnit"
range-key="enterpriseName" :range="dutyUnitList" @change="bindDutyUnit">
<view class="uni-input" :class="{'noCheck': !addForm.dutyUnit.toString()}">
{{addForm.dutyUnit.toString() ? dutyUnitList[addForm.dutyUnit].enterpriseName : "请选择整改单位"}}
<uni-icons v-if="!isDisabled" type="arrowright" color="#6C7178" />
</view>
</picker>
</view>
</view>
<view class="b-bottom" v-if="addForm.status != 1"> <view class="b-bottom" v-if="addForm.status != 1">
<view class="form-item flex"> <view class="form-item flex">
<view class="form-lable"><text>要求完成时间</text></view> <view class="form-lable"><text>要求完成时间</text></view>
@ -193,14 +191,14 @@
<uni-icons v-if="!isDisabled" type="arrowright" color="#6C7178" /> <uni-icons v-if="!isDisabled" type="arrowright" color="#6C7178" />
</view> </view>
</picker> --> </picker> -->
<dateTimePicker :placeholder="startTime" :disabled="isDisabled" <dateTimePicker :placeholder="startTime" :disabled="isDisabled" :start="startTime"
:start="startTime" fields="minute" :default-value="addForm.date" fields="minute" :default-value="addForm.date"
@change="bindPickerChange($event,'startTime2')" class="form-content"> @change="bindPickerChange($event,'startTime2')" class="form-content">
<view class="uni-input"> <view class="uni-input">
<!-- <text>{{addForm.date}}</text> --> <!-- <text>{{addForm.date}}</text> -->
<uni-icons v-if="!isDisabled" type="arrowright" color="#6C7178" /> <uni-icons v-if="!isDisabled" type="arrowright" color="#6C7178" />
</view> </view>
</dateTimePicker> </dateTimePicker>
</view> </view>
</view> </view>
@ -280,12 +278,12 @@
import headers from '../../../components/headers/headers.vue'; import headers from '../../../components/headers/headers.vue';
import replyList from './replyList.vue'; import replyList from './replyList.vue';
import dialogs from '../../../components/dialog/dialog.vue' import dialogs from '../../../components/dialog/dialog.vue'
import dateTimePicker from '@/components/dateTimePicker/index.vue' import dateTimePicker from '@/components/dateTimePicker/index.vue'
export default { export default {
data() { data() {
return { return {
startTime: this.getDate({ startTime: this.getDate({
format: true, format: true,
}), }),
checkPointList: [], checkPointList: [],
hiddenDangerInspectRegionId: "", hiddenDangerInspectRegionId: "",
@ -334,10 +332,10 @@
remark: "", remark: "",
taskId: '', taskId: '',
itemId: '', itemId: '',
//inspectTime: this.getDate({ //inspectTime: this.getDate({
//format: true, //format: true,
//}), //}),
inspectTime: '' inspectTime: ''
}, },
pageType: 1, pageType: 1,
replyData: [], replyData: [],
@ -351,7 +349,9 @@
taskId: "", taskId: "",
itemId: "", itemId: "",
base64Image: '', base64Image: '',
moduleType: '' moduleType: '',
enterpriseId: '',
inspectHiddenDangerItemRecordId: ''
} }
}, },
computed: { computed: {
@ -365,23 +365,23 @@
dialogs, dialogs,
canversCom, canversCom,
tkiTree, tkiTree,
dateTimePicker dateTimePicker
}, },
onShow() { onShow() {
this.statusBarHeight = uni.getStorageSync('systemInfo').statusBarHeight; this.statusBarHeight = uni.getStorageSync('systemInfo').statusBarHeight;
this.projectSn = JSON.parse(uni.getStorageSync('userInfo')).sn this.projectSn = JSON.parse(uni.getStorageSync('userInfo')).sn
this.userId = JSON.parse(uni.getStorageSync('userInfo')).userId this.userId = JSON.parse(uni.getStorageSync('userInfo')).userId
this.queryTypeList() this.queryTypeList()
this.queryUserData()
this.getSubpackageLsit() this.getSubpackageLsit()
if (uni.getStorageSync('dangerData')) { if (uni.getStorageSync('dangerData')) {
let dangerData = uni.getStorageSync('dangerData') let dangerData = uni.getStorageSync('dangerData')
console.log(dangerData,777888)
this.addForm.examineContent = dangerData.checkContent this.addForm.examineContent = dangerData.checkContent
this.addForm.examineLv = dangerData.hiddenDangerLevel this.addForm.examineLv = dangerData.hiddenDangerLevel
this.addForm.requestContent = dangerData.rectifyRequire this.addForm.requestContent = dangerData.rectifyRequire
this.addForm.examineProject = dangerData.hiddenDangerName this.addForm.examineProject = dangerData.hiddenDangerName
this.addForm.examineEntry = dangerData.title this.addForm.examineEntry = dangerData.title
this.inspectHiddenDangerItemRecordId = dangerData.id
console.log(uni.getStorageSync('dangerData'), '-----检查项列表带回数据') console.log(uni.getStorageSync('dangerData'), '-----检查项列表带回数据')
} }
@ -469,21 +469,21 @@
this.taskId = val.taskId this.taskId = val.taskId
this.itemId = val.itemId this.itemId = val.itemId
} }
if(val.moduleType){ if (val.moduleType) {
this.moduleType = val.moduleType; this.moduleType = val.moduleType;
} }
console.log(val, '----页面类型') console.log(val, '----页面类型')
}, },
methods: { methods: {
//下拉选择回显 //下拉选择回显
bindPickerChange(e, type) { bindPickerChange(e, type) {
console.log(e) console.log(e)
if (type == 'startTime') { if (type == 'startTime') {
this.addForm.inspectTime = e.f3; this.addForm.inspectTime = e.f3;
} else if (type == 'startTime2') { } else if (type == 'startTime2') {
this.addForm.date = e.f3; this.addForm.date = e.f3;
} }
}, },
//确定选中--回显 //确定选中--回显
checkPointBtn(val, type) { checkPointBtn(val, type) {
// type==1 责任区域 // type==1 责任区域
@ -581,7 +581,8 @@
url: 'xmgl/systemUser/getProjectChilderSystemUserList', url: 'xmgl/systemUser/getProjectChilderSystemUserList',
method: 'post', method: 'post',
data: { data: {
projectSn: this.projectSn projectSn: this.projectSn,
enterpriseId: this.enterpriseId
}, },
success: res => { success: res => {
_this.dutyPeopleList = res.result _this.dutyPeopleList = res.result
@ -646,10 +647,10 @@
this.addForm.date = e.detail.value this.addForm.date = e.detail.value
console.log(e.detail.value) console.log(e.detail.value)
}, },
bindCheckDateChange(e) { bindCheckDateChange(e) {
this.addForm.inspectTime = e.detail.value this.addForm.inspectTime = e.detail.value
console.log(e.detail.value) console.log(e.detail.value)
}, },
bindPeopleId(e) { bindPeopleId(e) {
this.addForm.dutyPeople = e.detail.value this.addForm.dutyPeople = e.detail.value
this.addForm.dutyPeopleId = this.dutyPeopleList[e.detail.value].userId this.addForm.dutyPeopleId = this.dutyPeopleList[e.detail.value].userId
@ -661,6 +662,11 @@
bindDutyUnit(e) { bindDutyUnit(e) {
this.addForm.dutyUnit = e.detail.value this.addForm.dutyUnit = e.detail.value
this.addForm.enterpriseSn = this.dutyUnitList[e.detail.value].enterpriseSn this.addForm.enterpriseSn = this.dutyUnitList[e.detail.value].enterpriseSn
this.enterpriseId = this.dutyUnitList[e.detail.value].id;
this.queryUserData()
// 切换清空责任人
this.addForm.dutyPeople = "";
this.addForm.dutyPeopleId = "";
console.log(e.detail.value) console.log(e.detail.value)
}, },
bindAddress(e) { bindAddress(e) {
@ -672,9 +678,9 @@
let year = date.getFullYear(); let year = date.getFullYear();
let month = date.getMonth() + 1; let month = date.getMonth() + 1;
let day = date.getDate(); let day = date.getDate();
let hour = date.getHours(); let hour = date.getHours();
let minute = date.getMinutes(); let minute = date.getMinutes();
let second = date.getSeconds(); let second = date.getSeconds();
if (type === 'start') { if (type === 'start') {
year = year; year = year;
} else if (type === 'end') { } else if (type === 'end') {
@ -695,7 +701,8 @@
// uni.removeStorageSync('dangerData'); // uni.removeStorageSync('dangerData');
// } // }
uni.navigateTo({ uni.navigateTo({
url: './dangerLibrary?type=1&taskId=' + this.taskId + '&itemId=' + this.itemId + '&engineeringId=' + this.engineeringId + '&moduleType=' + this.moduleType url: './dangerLibrary?type=1&taskId=' + this.taskId + '&itemId=' + this.itemId +
'&engineeringId=' + this.engineeringId + '&moduleType=' + this.moduleType
}) })
} }
}, },
@ -849,6 +856,9 @@
hiddenDangerInspectRegionName: this.hiddenDangerInspectRegionName, hiddenDangerInspectRegionName: this.hiddenDangerInspectRegionName,
hiddenDangerInspectRegionId: this.hiddenDangerInspectRegionId hiddenDangerInspectRegionId: this.hiddenDangerInspectRegionId
}; };
if(this.inspectHiddenDangerItemRecordId){
data.inspectHiddenDangerItemRecordId = this.inspectHiddenDangerItemRecordId
}
data.inspectTypeId = this.addForm.typeId data.inspectTypeId = this.addForm.typeId
data.taskId = this.taskId data.taskId = this.taskId
data.itemId = this.itemId data.itemId = this.itemId
@ -875,14 +885,22 @@
}); });
return; return;
} }
if (this.addForm.inspectTime == "") { if (this.addForm.inspectTime == "") {
uni.showToast({ uni.showToast({
title: '请选择检查时间！', title: '请选择检查时间！',
icon: "none", icon: "none",
duration: 2000 duration: 2000
}); });
return; return;
} }
if (!this.addForm.enterpriseSn) {
uni.showToast({
title: '请选择整改单位！',
icon: "none",
duration: 2000
});
return;
}
if (this.addForm.dutyPeopleId == "") { if (this.addForm.dutyPeopleId == "") {
uni.showToast({ uni.showToast({
title: '请选择整改责任人！', title: '请选择整改责任人！',
@ -915,14 +933,14 @@
data.checkItemResultId = this.addForm.checkItemResultId data.checkItemResultId = this.addForm.checkItemResultId
} }
} else { } else {
if (data.inspectTime == "") { if (data.inspectTime == "") {
uni.showToast({ uni.showToast({
title: '请选择检查时间！', title: '请选择检查时间！',
icon: "none", icon: "none",
duration: 2000 duration: 2000
}); });
return; return;
} }
if (data.dutyRegion == "") { if (data.dutyRegion == "") {
uni.showToast({ uni.showToast({
title: '请填写详细位置信息！', title: '请填写详细位置信息！',
@ -953,7 +971,7 @@
uni.showToast({ uni.showToast({
title: '保存成功' title: '保存成功'
}) })
if(this.moduleType == 'safeCheck'){ if (this.moduleType == 'safeCheck') {
uni.navigateBack({ uni.navigateBack({
delta: 3 delta: 3
}) })
@ -1041,6 +1059,7 @@
.addExamine { .addExamine {
position: relative; position: relative;
overflow: hidden; overflow: hidden;
.fixedheader { .fixedheader {
position: fixed; position: fixed;
top: 0; top: 0;
@ -1176,9 +1195,10 @@
.uni-input { .uni-input {
line-height: 36rpx; line-height: 36rpx;
} }
.uni-input2 {
color: black; .uni-input2 {
} color: black;
}
} }
.a-start { .a-start {
@ -1369,10 +1389,11 @@
.example-body { .example-body {
padding: 0 0 20rpx 140rpx; padding: 0 0 20rpx 140rpx;
} }
.dateTimePicker {
border: 1px solid #ccc; .dateTimePicker {
border-radius: 5px; border: 1px solid #ccc;
width: 67%; border-radius: 5px;
padding-left: 10px; width: 67%;
} padding-left: 10px;
</style> }
</style>

BIN
unpackage/cache/apk/__UNI__4AA4101_cm.apk vendored
View File

Binary file not shown.

2
unpackage/cache/apk/apkurl vendored
View File

@ -1 +1 @@
https://app.liuyingyong.cn/build/download/302c99c0-032b-11ef-8c42-8324348b8627 https://app.liuyingyong.cn/build/download/d196e210-04b0-11ef-8714-09b26180e8b2

2
unpackage/cache/apk/cmManifestCache.json vendored
View File

File diff suppressed because one or more lines are too long

4
unpackage/cache/wgt/__UNI__4AA4101/app-config-service.js vendored
View File

File diff suppressed because one or more lines are too long

8
unpackage/cache/wgt/__UNI__4AA4101/app-service.js vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/cache/wgt/__UNI__4AA4101/app-view.js vendored
View File

File diff suppressed because one or more lines are too long

4
unpackage/dist/build/app-plus/app-config-service.js vendored
View File

File diff suppressed because one or more lines are too long

8
unpackage/dist/build/app-plus/app-service.js vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/build/app-plus/app-view.js vendored
View File

File diff suppressed because one or more lines are too long