diff --git a/pages/investigation/task.vue b/pages/investigation/task.vue index 4bcc9e0..dbc7948 100644 --- a/pages/investigation/task.vue +++ b/pages/investigation/task.vue @@ -385,11 +385,12 @@ 取消 + showProblem = false; + hiddenDangerList2 = []; + describe.hdDesc = ''; + describe.hdInfo = ''; + ">取消 + 存在隐患 确认 @@ -941,7 +942,7 @@ }, showInvestigationTag2(v) { - // console.log(v, this.investigationSelectList) + console.log('gxh查看1', v, this.investigationSelectList, this.hiddenDangerList) if (this.checked.includes(v.id)) { this.showInvestigation2 = true; this.showInvestigation2Item = v @@ -997,6 +998,7 @@ this.showPicker = true }, select2(v, list, list2) { + console.log('select2') list.dangerItems.forEach(item => { // 假设this.troubleshootingData中没有与当前item.id相同的id let found = false; @@ -1064,6 +1066,7 @@ }, select3(v) { + console.log('select3') // this.investigationSelectList.map((r) => { // if (r.nid == v.nid) { // r = v; @@ -1291,155 +1294,107 @@ }, // "/hiddenDanger/highDanger/getSectionInfo", getBaseData(businessId) { - this.$request - .globalRequest( - "/hiddenDanger/highDanger/getSectionInfo", { - nuserid: this.$.getData("token"), - businessId - }, - "GET" - ) - .then((res) => { - if (res.code === 200) { - for (let k in res.result) { - if (res.result[k] == 0) { - res.result[k] = "" - } + this.$request.globalRequest("/hiddenDanger/highDanger/getSectionInfo", {nuserid: this.$.getData("token"), businessId}, "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.$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.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.$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 + } } - }); - 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.investigationSelectList = res.result; + this.investigationSelectList.map((r) => { + this.troubleshootingData = [...this.troubleshootingData, ...r.dangerItems] + }); + console.log('this.troubleshootingData', this.troubleshootingData) + // console.log(this.troubleshootingData, 11111) + this.checked = this.troubleshootingData.map(r => { + if (r.checked == 1) { + return r.id } - // console.log(res.result,11111) - this.investigationSelectList = res.result; - this.investigationSelectList.map((r) => { - this.troubleshootingData = [...this.troubleshootingData, ...r.dangerItems] - }); - 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.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.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) { // this.problemTreeSelectConfirmList.push(item) @@ -1465,7 +1420,7 @@ ) .then((res) => { 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(res.result, 321) @@ -1861,7 +1816,7 @@ this.extraConfigs = extraConfigs this.describeArr = describe this.temporary = temporary - console.log(this.extraConfigs, this.describeArr) + console.log('describeArrdescribeArrdescribeArr', this.extraConfigs, this.describeArr) if (!temporary) { this.postSaveManualInvestigation() return diff --git a/pages/knowledge/index.vue b/pages/knowledge/index.vue index d68e602..99ebdd7 100644 --- a/pages/knowledge/index.vue +++ b/pages/knowledge/index.vue @@ -1,1110 +1,1088 @@ - - - - - \ No newline at end of file + line-height: 42rpx; + } + + .tipItem { + background-color: #e1f8f8; + margin: 15rpx; + padding: 15rpx; + + .title { + font-size: 32rpx; + font-weight: 700; + } + + .text { + font-size: 28rpx; + } + } + } + + .text { + font-size: 28rpx; + } + } + + .stepBox { + width: 100%; + height: 150rpx; + display: flex; + justify-content: center; + align-items: center; + background-color: #ffffff; + + .step { + display: flex; + + .stepItem { + display: flex; + flex-direction: column; + align-items: center; + } + + .circles { + display: flex; + // justify-content: space-between; + padding: 22px 0; + + .circle { + width: 4rpx; + height: 4rpx; + border-radius: 50%; + background-color: #e9edf5; + margin: 0 1px; + } + + .circleActive { + width: 4rpx; + height: 4rpx; + border-radius: 50%; + background-color: #ccc; + margin: 0 1px; + } + } + + .stepCircle { + width: 60rpx; + height: 60rpx; + line-height: 60rpx; + border-radius: 50%; + background-color: #e9edf5; + color: #a0abbd; + text-align: center; + margin-bottom: 10rpx; + } + + .stepCircleActive { + width: 50rpx; + height: 50rpx; + line-height: 50rpx; + border-radius: 50%; + background-color: #295cbc; + color: #ffffff; + text-align: center; + margin-bottom: 4rpx; + border: 5px solid #c6d8fc; + } + + .stepText { + font-size: 16px; + color: #bcc3cd; + } + } + } + + .chatlist { + width: 96%; + margin: auto; + height: calc(100vh - 1px) !important; + /* #ifdef H5 */ + height: calc(100vh - 100px) !important; + /*#endif*/ + // background-color: #f0f2f7; + // padding-bottom: 110rpx; + + .bar { + width: 100%; + display: flex; + margin-bottom: 40rpx; + overflow: hidden; + + .img { + width: 80rpx; + height: 80rpx; + margin-top: 15rpx; + } + + .content { + display: inline-block; + max-width: 80%; + border: 1px solid #ddd; + border-radius: 5px; + padding: 0; + margin: 15rpx 20rpx 0 20rpx; + // flex: 1; + overflow: hidden; + background-color: #ffffff; + + ._img { + max-width: 80%; + } + } + + &.currAnswer { + flex-direction: row-reverse; + + .content { + background-color: #cce0ff; + } + } + } + } + + .chatlist-wrapper-expanded { + // padding-bottom: 230rpx; + } + + .input-wrapper { + display: flex; + position: fixed; + bottom: 0; + z-index: 10; + width: 100%; + margin: 20rpx auto 0 auto; + // height: 80rpx; + flex-direction: column; + background-color: #ffffff; + box-sizing: border-box; + border-top: 1px solid #e2e4e9; + bottom: 1px solid #e2e4e9; + padding: 20rpx 20rpx 20rpx 20rpx; + + .topContent { + display: flex; + width: 100%; + } + + .expanded { + background-color: #f5f7fa; + display: flex; + margin-top: 10rpx; + + .expandedItem { + width: 106rpx; + height: 106rpx; + display: flex; + flex-direction: column; + align-items: center; + justify-content: space-between; + + .camera-icon { + margin-top: 5px; + } + } + + .video { + width: 56rpx; + height: 56rpx; + } + } + } + + .input-wrapper-expanded { + // height: 200rpx; + } + + .uni-input { + height: 56rpx; + line-height: 56rpx; + font-size: 30rpx; + padding: 0rpx 10rpx; + flex: 1; + background-color: #fff; + } + + .uni-icon { + font-family: uniicons; + font-size: 48rpx; + font-weight: normal; + font-style: normal; + width: 48rpx; + height: 48rpx; + line-height: 48rpx; + color: #999999; + margin: 0 10rpx; + } + + .loading-animation { + display: flex; + justify-content: center; + margin-top: 0; + + .bounce-dot { + width: 20rpx; + height: 20rpx; + margin: 10rpx; + background-color: #666; + border-radius: 50%; + animation: bounce 1.4s infinite both; + + &:nth-child(2) { + animation-delay: 0.2s; + } + + &:nth-child(3) { + animation-delay: 0.4s; + } + } + } + } + + + .con { + width: 600rpx; + height: 100rpx; + } + + .con-wrapper-expanded { + width: 600rpx; + height: 230rpx; + } + + @keyframes bounce { + + 0%, + 80%, + 100% { + transform: scale(0); + } + + 40% { + transform: scale(1); + } + } + + .downward { + position: fixed; + z-index: 100rpx; + right: 20rpx; + bottom: 150rpx; + background: #ffffff; + border: #cccccc solid 1px; + width: 60rpx; + height: 60rpx; + border-radius: 50%; + display: flex; + justify-content: center; + align-items: center; + + /deep/ .u-icon__icon { + font-size: 30rpx !important; + color: #999999 !important; + } + } + .icon{ + display: flex; + justify-content: flex-end; + margin: 0 15rpx 15rpx 12rpx; + .uni-icons{ + margin-left: 15rpx; + } + } +