lizhichao
/
hitap-chat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of http://42.192.7.176:3000/lizhichao/hitap-chat

Browse Source 
# Conflicts:
#	pages/knowledge/index.vue
main
limingtao 11 months ago
parent cbe8166381 49d35c25b4
commit 99b7b27b51
2 changed files with 1191 additions and 1258 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 253
      pages/investigation/task.vue
  2. 2196
      pages/knowledge/index.vue

253
pages/investigation/task.vue
Unescape View File

@ -385,11 +385,12 @@
<u-popup :show="showProblem" @close="showProblem = false"> <u-popup :show="showProblem" @close="showProblem = false">
<view class="custom-pop-head"> <view class="custom-pop-head">
<view class="left" @click=" <view class="left" @click="
showProblem = false; showProblem = false;
hiddenDangerList2 = []; hiddenDangerList2 = [];
describe.hdDesc = ''; describe.hdDesc = '';
describe.hdInfo = ''; describe.hdInfo = '';
">取消</view> ">取消
</view>
<view class="title">存在隐患</view> <view class="title">存在隐患</view>
<view class="right" @click="investigationHandle2">确认</view> <view class="right" @click="investigationHandle2">确认</view>
</view> </view>
@ -941,7 +942,7 @@
}, },
showInvestigationTag2(v) { showInvestigationTag2(v) {
// console.log(v, this.investigationSelectList) console.log('gxh查看1', v, this.investigationSelectList, this.hiddenDangerList)
if (this.checked.includes(v.id)) { if (this.checked.includes(v.id)) {
this.showInvestigation2 = true; this.showInvestigation2 = true;
this.showInvestigation2Item = v this.showInvestigation2Item = v
@ -997,6 +998,7 @@
this.showPicker = true this.showPicker = true
}, },
select2(v, list, list2) { select2(v, list, list2) {
console.log('select2')
list.dangerItems.forEach(item => { list.dangerItems.forEach(item => {
// 假设this.troubleshootingData中没有与当前item.id相同的id // 假设this.troubleshootingData中没有与当前item.id相同的id
let found = false; let found = false;
@ -1064,6 +1066,7 @@
}, },
select3(v) { select3(v) {
console.log('select3')
// this.investigationSelectList.map((r) => { // this.investigationSelectList.map((r) => {
// if (r.nid == v.nid) { // if (r.nid == v.nid) {
// r = v; // r = v;
@ -1291,155 +1294,107 @@
}, },
// "/hiddenDanger/highDanger/getSectionInfo", // "/hiddenDanger/highDanger/getSectionInfo",
getBaseData(businessId) { getBaseData(businessId) {
this.$request this.$request.globalRequest("/hiddenDanger/highDanger/getSectionInfo", {nuserid: this.$.getData("token"), businessId}, "GET").then((res) => {
.globalRequest( if (res.code === 200) {
"/hiddenDanger/highDanger/getSectionInfo", { for (let k in res.result) {
nuserid: this.$.getData("token"), if (res.result[k] == 0) {
businessId res.result[k] = ""
},
"GET"
)
.then((res) => {
if (res.code === 200) {
for (let k in res.result) {
if (res.result[k] == 0) {
res.result[k] = ""
}
} }
this.formData = {
...this.formData,
...res.result
};
console.log('this.columnsdlPicker', this.columnsdlPicker)
this.columnsdlPicker[0]?.forEach(item => {
if(item.enumvalue == this.formData.roadType) {
this.$set(this.formData, 'roadTypeName', item.enumName)
}
})
this.getStreetCommunityByXq()
this.getBaseDefaultData()
} }
}); this.formData = {
this.$request ...this.formData,
.globalRequest( ...res.result
"/hiddenDanger/highDanger/getSectionTraffic", { };
nuserid: this.$.getData("token"), console.log('this.columnsdlPicker', this.columnsdlPicker)
businessId this.columnsdlPicker[0]?.forEach(item => {
}, if(item.enumvalue == this.formData.roadType) {
"GET" this.$set(this.formData, 'roadTypeName', item.enumName)
) }
.then((res) => { })
if (res.code === 200) { this.getStreetCommunityByXq()
// todo 无数据结构 this.getBaseDefaultData()
this.formData = { }
...this.formData, });
...res.result this.$request.globalRequest("/hiddenDanger/highDanger/getSectionTraffic", {nuserid: this.$.getData("token"), businessId}, "GET").then((res) => {
}; if (res.code === 200) {
// todo 无数据结构
this.formData = {
...this.formData,
...res.result
};
}
});
this.$request.globalRequest("/hiddenDanger/highDanger/getImportDangerDisplay", {sid: "02", businessId}, "GET").then((res) => {
if (res.code === 200) {
// todo 无数据结构
for (let items of res.result) {
for (let item of items.dangerItems) {
item.nid = items.nid
}
} }
}); // console.log(res.result,11111)
this.$request this.investigationSelectList = res.result;
.globalRequest( this.investigationSelectList.map((r) => {
"/hiddenDanger/highDanger/getImportDangerDisplay", { this.troubleshootingData = [...this.troubleshootingData, ...r.dangerItems]
sid: "02", });
businessId console.log('this.troubleshootingData', this.troubleshootingData)
}, // console.log(this.troubleshootingData, 11111)
"GET" this.checked = this.troubleshootingData.map(r => {
) if (r.checked == 1) {
.then((res) => { return r.id
if (res.code === 200) {
// todo 无数据结构
for (let items of res.result) {
for (let item of items.dangerItems) {
item.nid = items.nid
}
} }
// console.log(res.result,11111) })
this.investigationSelectList = res.result; this.checked = this.checked.filter(item => item !== undefined);
this.investigationSelectList.map((r) => { for (let i in this.troubleshootingData) {
this.troubleshootingData = [...this.troubleshootingData, ...r.dangerItems] if (this.troubleshootingData[i].checked == 1) {
}); // alert(111)
console.log('this.troubleshootingData', this.troubleshootingData)
// console.log(this.troubleshootingData, 11111)
this.checked = this.troubleshootingData.map(r => {
if (r.checked == 1) {
return r.id
}
})
this.checked = this.checked.filter(item => item !== undefined);
for (let i in this.troubleshootingData) {
if (this.troubleshootingData[i].checked == 1) {
// alert(111)
this.initTroubleshootingData(this.troubleshootingData[i].id, i)
}
this.initTroubleshootingData(this.troubleshootingData[i].id, i)
} }
this.initCheckedSelect()
// console.log(this.troubleshootingData)
// this.$request
// .globalRequest(
// "/hiddenDanger/highDanger/getImportDangerDisplayDetail", {
// nuserid: this.$.getData("token"),
// businessId,
// dangerId: '26'
// },
// "GET"
// )
// .then((res) => {
// if (res.code === 200) {
// this.investigationSelectList.map((r) => {
// r.extraConfigs = [];
// res.result.map((m) => {
// if (r.nid == m.scenesId) {
// r.extraConfigs.push(m);
// }
// });
// });
// }
// });
}
});
this.$request
.globalRequest(
"/hiddenDanger/highDanger/getImportDangers", {
nuserid: this.$.getData("token"),
businessId
},
"GET"
)
.then((res) => {
if (res.code === 200) {
this.investigationList = res.result;
}
});
this.$request
.globalRequest(
"/hiddenDanger/highDanger/getUserHiddenDangerList", {
// nuserid: this.$.getData("token"),
pcType: 2,
businessId
},
"GET"
)
.then((res) => {
if (res.code === 200) {
this.hiddenDangerList.push(...res.result)
}
});
this.$request
.globalRequest(
"/hiddenDanger/highDanger/getDangerItems", {
nuserid: this.$.getData("token"),
businessId
},
"GET"
)
.then((res) => {
if (res.code === 200) {
this.problemTreeSelectConfirmList = res.result;
} }
}); this.initCheckedSelect()
// console.log(this.troubleshootingData)
// this.$request
// .globalRequest(
// "/hiddenDanger/highDanger/getImportDangerDisplayDetail", {
// nuserid: this.$.getData("token"),
// businessId,
// dangerId: '26'
// },
// "GET"
// )
// .then((res) => {
// if (res.code === 200) {
// this.investigationSelectList.map((r) => {
// r.extraConfigs = [];
// res.result.map((m) => {
// if (r.nid == m.scenesId) {
// r.extraConfigs.push(m);
// }
// });
// });
// }
// });
}
});
this.$request.globalRequest("/hiddenDanger/highDanger/getImportDangers", {nuserid: this.$.getData("token"), businessId}, "GET").then((res) => {
if (res.code === 200) {
this.investigationList = res.result;
}
});
this.$request.globalRequest("/hiddenDanger/highDanger/getUserHiddenDangerList", {pcType: 2, businessId}, "GET").then((res) => {
if (res.code === 200) {
this.hiddenDangerList.push(...res.result)
}
});
this.$request.globalRequest("/hiddenDanger/highDanger/getDangerItems", {nuserid: this.$.getData("token"), businessId}, "GET")
.then((res) => {
if (res.code === 200) {
this.problemTreeSelectConfirmList = res.result;
}
});
}, },
handleSelectProblem(item, index) { handleSelectProblem(item, index) {
// this.problemTreeSelectConfirmList.push(item) // this.problemTreeSelectConfirmList.push(item)
@ -1465,7 +1420,7 @@
) )
.then((res) => { .then((res) => {
if (res.code === 200 && res.result.length != 0) { if (res.code === 200 && res.result.length != 0) {
this.hiddenDangerList.push(...res.result) // this.hiddenDangerList.push(...res.result)
console.log(this.troubleshootingData, 123) console.log(this.troubleshootingData, 123)
console.log(res.result, 321) console.log(res.result, 321)
@ -1861,7 +1816,7 @@
this.extraConfigs = extraConfigs this.extraConfigs = extraConfigs
this.describeArr = describe this.describeArr = describe
this.temporary = temporary this.temporary = temporary
console.log(this.extraConfigs, this.describeArr) console.log('describeArrdescribeArrdescribeArr', this.extraConfigs, this.describeArr)
if (!temporary) { if (!temporary) {
this.postSaveManualInvestigation() this.postSaveManualInvestigation()
return return

2196
pages/knowledge/index.vue
View File

File diff suppressed because it is too large Load Diff
Write Preview
Loading…
Cancel
Save