From 3eeb05f4eab2a9db621f15943578b012dbbcb4ae Mon Sep 17 00:00:00 2001 From: douzhuo <17611323298@163.com> Date: Wed, 24 Aug 2022 15:27:37 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=AC=E5=91=8A?= =?UTF-8?q?=E4=B8=8D=E7=A9=BFprojectID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/mine/messageList.vue | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/pages/mine/messageList.vue b/pages/mine/messageList.vue index 97d608d..e64c4b0 100644 --- a/pages/mine/messageList.vue +++ b/pages/mine/messageList.vue @@ -30,9 +30,9 @@ - + {{item.title}} - + @@ -175,16 +175,19 @@ }, updateInit() { + let obj = { + messageType: this.list[this.current].id, + id: uni.getStorageSync('weapp_session_userInfo_data').accountId, + num: this.pageNum, + size: this.pageSize + } + if (this.current == 0) { + obj.projectId = uni.getStorageSync('buildingID').id + } uni.request({ url: config.service.updateList, method: "GET", - data: { - messageType: this.list[this.current].id, - projectId: uni.getStorageSync('buildingID').id, - id: uni.getStorageSync('weapp_session_userInfo_data').accountId, - num: this.pageNum, - size: this.pageSize - }, + data: obj, header: { 'content-type': 'application/json', 'Access-Token': uni.getStorageSync('weapp_session_login_data').token @@ -194,7 +197,7 @@ if (this.pageNum != 1) { this.updateAnnList = [...this.updateAnnList, ...res.data.data.list.results]; } else { - + this.updateAnnList = res.data.data.list.results || [] } } @@ -245,7 +248,7 @@ }) } }, - + fomatDate(date) { if (!date) return '--' let arr = date.split(' ') @@ -253,7 +256,7 @@ let result = str.split('-') return `${result[1]}月${result[2]}日` }, - + // 转换时间 getTimeLine(date, type = 1) { let resu = '--' @@ -263,10 +266,10 @@ let arr = date.split(' ') let str = arr[0] let result = str.split('-') - + let m = (time.getMonth() + 1) < 10 ? `0${time.getMonth() + 1}` : (time.getMonth() + 1) let d = time.getDate() < 10 ? `0${time.getDate()}` : time.getDate() - + if (type == 1) { resu = `${m}.${d}-${result[1]}.${result[2]}` } else { @@ -274,7 +277,7 @@ } return resu }, - + change(index) { this.current = index; this.initPage() From 4e1fe0631fdefbfc5eafda56903227439f8f9a3a Mon Sep 17 00:00:00 2001 From: douzhuo <17611323298@163.com> Date: Wed, 24 Aug 2022 15:29:57 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=AC=E5=91=8A?= =?UTF-8?q?=E4=B8=8D=E7=A9=BFprojectID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/mine/messageList.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pages/mine/messageList.vue b/pages/mine/messageList.vue index e64c4b0..45c4baf 100644 --- a/pages/mine/messageList.vue +++ b/pages/mine/messageList.vue @@ -183,6 +183,8 @@ } if (this.current == 0) { obj.projectId = uni.getStorageSync('buildingID').id + } else { + obj.projectId = '' } uni.request({ url: config.service.updateList, From f42ee3346fe131a0517bcd334b636773441a2857 Mon Sep 17 00:00:00 2001 From: douzhuo <17611323298@163.com> Date: Wed, 24 Aug 2022 16:35:32 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=AC=E5=91=8A?= =?UTF-8?q?=E4=B8=8D=E7=A9=BFprojectID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/mine/details2.vue | 59 ++++++++++++++++++++++------------------- 1 file changed, 32 insertions(+), 27 deletions(-) diff --git a/pages/mine/details2.vue b/pages/mine/details2.vue index 2a66bec..39adfe0 100644 --- a/pages/mine/details2.vue +++ b/pages/mine/details2.vue @@ -101,24 +101,23 @@ - + 更多 - 设备日志 - + 接待信息 - - {{userlistobj.validInvalidName}} - + - - - 接待信息 - - + @@ -769,14 +772,15 @@ }, methods: { - clickWajue(item){ - if(item.selected==0){ + clickWajue(item) { + if (item.selected == 0) { this.Pinspeak = false uni.navigateTo({ - url: '/pages/learning/Keywordsearch?customerId=' + this.customerId + "&keyword=" + item.question + + url: '/pages/learning/Keywordsearch?customerId=' + this.customerId + "&keyword=" + item + .question + "&skpl=" + "2" + '&UpDateEvent=DETAILS2INIT' - }) - } + }) + } }, //获取画像标签 getWordMiningList() { @@ -818,9 +822,9 @@ this.wajueshow = true return; } - + this.wajueshow = true - if(!this.flag){ + if (!this.flag) { this.flag = true uni.request({ url: config.service.addWordMining, @@ -1354,7 +1358,7 @@ if (this.roleSelectArr.findIndex(item => item == 0) == -1) { str += `&speakerStr=${this.roleSelectArr.join(',')}` } - + uni.request({ url: `${config.service.getCorpusAnal}${str}`, method: "GET", @@ -1384,8 +1388,8 @@ this.tablist[0].select = true this.tablist[res.speaker].name = this.tablist[res.speaker].name + "顾问"; } - - + + this.newluyinList = jsonInfo; if (this.textindex == null) { return @@ -1898,7 +1902,7 @@ uni.request({ url: config.service.getCorpusAnal + '?corpusId=' + this.luyinList[this.csdFileindex].id + "&bg=" + info.bg + "&speaker=" + this.roleindex + '&voFlag=0' + - '&num=50', + '&num=50', method: "GET", header: { 'content-type': 'application/json', @@ -2239,6 +2243,7 @@ color: #fff; } } + &::-webkit-scrollbar { width: 0; height: 0;