From 04f463bd7e6312514088ae43bcc5a55d718af5d3 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Tue, 14 Jun 2022 18:28:26 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20bug?= =?UTF-8?q?=20#52933=20=E5=89=8D=E7=AB=AF=E5=A4=84=E7=90=86=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzrk/step1.vue | 49 +++++++++---------- 1 file changed, 23 insertions(+), 26 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 2005f5b69..b4394d287 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -1775,19 +1775,6 @@ export default { 'form.treeListName'(val) { console.log(this.form.treeListName) }, - 'form.country': { - handler(val) { - if (val !== '' && val !== null && typeof (val) !== 'undefined') { - if (val instanceof Array) { - this.countryArr = val.join(","); - } else { - this.countryArr = val - } - } else if (val === '') { - this.countryArr = '' - } - } - }, filterText(val) { this.$refs.tree.filter(val); }, @@ -1957,14 +1944,14 @@ export default { this.verifySarStandard = false /** val === '1' (国外) val === '0'（ 国内 ）*/ // 国内英文名称不必填 国外必填 ，标准性质国内不体现 - if (val === '1') { - this.rules.standName[0].required = false - this.rules.standEnName[0].required = true; - this.rules.standNature[0].required = false - } else { - this.rules.standName[0].required = true - this.rules.standNature[0].required = true - this.rules.standEnName[0].required = false; + if(this.rules){ + if (val === '1') { + this.rules.standName[0].required = false + this.rules.standNature[0].required = false + } else { + this.rules.standName[0].required = true + this.rules.standNature[0].required = true + } } this.standardSearchForm.standType = val === '0' ? 'INLAND' : 'FOREIGN' //切换清空表单 @@ -2270,11 +2257,6 @@ export default { }, res => { if (res && res.data) { const bringData = res.data - if (res.data.country) { - res.data.country = res.data.country.split(','); - } else { - res.data.country = [] - } bringData.txlb = '' bringData.signFlag = this.form.signFlag && this.form.signFlag != '' ? this.form.signFlag : '0' bringData.standInData = this.form.standInData && this.form.standInData != '' ? this.form.standInData : '0' @@ -2282,6 +2264,21 @@ export default { this.form = JSON.parse(JSON.stringify(json)) this.getListTree(bringData) this.form.standId = bringData.id + if (this.form.country) { + let val = this.form.country.replace('//',"").replace('["',"").replace('"]',"").toString() + if (val !== '' && val !== null && typeof (val) !== 'undefined') { + if (val instanceof Array) { + this.form.country = this.form.country.join(","); + } else { + this.form.country = [] + this.form.country.push(val) + } + } else if (val === '') { + this.form.country = [] + } + } else { + this.form.country = [] + } this.form.qcdw = JSON.parse(JSON.stringify(json)).qcdw && JSON.parse(JSON.stringify(json)).qcdw !== '[]' ? JSON.parse(JSON.stringify(json)).qcdw.split(',') : '' this.form.wssmr = JSON.parse(JSON.stringify(json)).wssmr && JSON.parse(JSON.stringify(json)).wssmr !== '[]' ? JSON.parse(JSON.stringify(json)).wssmr : '' this.form.zrgcs = JSON.parse(JSON.stringify(json)).zrgcs && JSON.parse(JSON.stringify(json)).zrgcs !== '[]' ? JSON.parse(JSON.stringify(json)).zrgcs : '' From 7e42473c799bd5e221946132666b2ede4e2c1058 Mon Sep 17 00:00:00 2001 From: zyd Date: Tue, 14 Jun 2022 19:51:19 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E9=9B=86=E6=88=90WELINK=E9=A1=B5=E9=9D=A2=E7=9A=84BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/axiosV2Phone/index.js | 1 - src/main.js | 6 ++-- src/pages/loginVerifyPhone/index.vue | 31 +++++++++++++------ src/pages/phone/phoneHome.vue | 1 - .../pages/creatProcess/qbrk-product/step1.vue | 1 - 5 files changed, 26 insertions(+), 14 deletions(-) diff --git a/src/common/axiosV2Phone/index.js b/src/common/axiosV2Phone/index.js index fdcec972e..bfdc37482 100644 --- a/src/common/axiosV2Phone/index.js +++ b/src/common/axiosV2Phone/index.js @@ -41,7 +41,6 @@ service.defaults.headers['Content-type'] = 'application/json' */ service.interceptors.request.use( config => { - debugger return config }, error => { diff --git a/src/main.js b/src/main.js index a922140d6..1f4539da8 100644 --- a/src/main.js +++ b/src/main.js @@ -144,9 +144,11 @@ router.beforeEach(function (to, from, next) { // 单点登录 /** 判断是不是在手机端操作 */ if (isMobile()) { - if(toName === 'phoneHome'){ + if(toName === 'phoneHome' && (token === undefined || token === null || token === '')){ next('/loginVerifyPhone') - }else if(toName === 'processCenter'){ + }else if(toName === 'phoneHome' && token != null){ + next() + } else if(toName === 'processCenter'){ // hwh5.close(); //关闭当前窗口 let userAgent = navigator.userAgent; diff --git a/src/pages/loginVerifyPhone/index.vue b/src/pages/loginVerifyPhone/index.vue index e71c91cc1..f7c9d1cdb 100644 --- a/src/pages/loginVerifyPhone/index.vue +++ b/src/pages/loginVerifyPhone/index.vue @@ -1,6 +1,10 @@ diff --git a/src/pages/phone/phoneHome.vue b/src/pages/phone/phoneHome.vue index ff6883784..242b6a93a 100644 --- a/src/pages/phone/phoneHome.vue +++ b/src/pages/phone/phoneHome.vue @@ -4,7 +4,6 @@

标 准 法 规 管 理 系 统 S R M S

-
Date: Tue, 14 Jun 2022 21:12:16 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20bug?= =?UTF-8?q?=20#52941=20=E6=B3=A8=E9=99=A4=E5=85=A8=E5=B1=80=E5=8F=B3?= =?UTF-8?q?=E6=BB=9A=E5=8A=A8=E6=9D=A1=20=E8=B0=83=E6=95=B4=20=E6=88=91?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E7=AD=94=20=E6=BB=9A=E5=8A=A8=E6=95=88?= =?UTF-8?q?=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 3 ++- src/pages/personal/pages/my-questions/index.vue | 14 ++++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/App.vue b/src/App.vue index 66361cd45..6f9e8d55e 100644 --- a/src/App.vue +++ b/src/App.vue @@ -372,13 +372,14 @@ export default { overflow-x: auto; display: flex; flex-direction: column; + overflow-y: hidden; .container-box { position: relative; height: calc(~'100% - 10px'); //flex: 1; background: #F4F4F4; - overflow-y: auto; + /*overflow-y: auto;*/ .pagination { border-top: 1px solid #f4f4f4; diff --git a/src/pages/personal/pages/my-questions/index.vue b/src/pages/personal/pages/my-questions/index.vue index b2bddf81f..7541be07c 100644 --- a/src/pages/personal/pages/my-questions/index.vue +++ b/src/pages/personal/pages/my-questions/index.vue @@ -1811,9 +1811,10 @@ export default { margin-right: 0; } /deep/.el-tabs__content { + overflow-y: auto; padding: 0; .el-tab-pane { - height: 100%; + height: 98%; } } } @@ -1825,7 +1826,7 @@ export default { border-top: none; border-bottom: none; /deep/.el-tabs__nav { - height: calc(~'100% - 50px'); + height: 100%; overflow: auto; } /deep/ &.el-tabs--border-card .el-tabs__item{ @@ -1865,6 +1866,15 @@ export default { background: #F5F7FA; float: right; margin: 20px 10px 0 80px; + word-break: break-word; /* 文本行的任意字内断开 */ + word-wrap: break-word; /* IE */ + white-space: -moz-pre-wrap; /* Mozilla */ + white-space: -hp-pre-wrap; /* HP printers */ + white-space: -o-pre-wrap; /* Opera 7 */ + white-space: -pre-wrap; /* Opera 4-6 */ + white-space: pre; /* CSS2 */ + white-space: pre-wrap; /* CSS 2.1 */ + white-space: pre-line; /* CSS 3 (and 2.1 as well, actually) */ } .info-answer{ height: 200px; From 6110d20b0c214f9fdd15f77c524160de6f4e743a Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Tue, 14 Jun 2022 22:10:09 +0800 Subject: [PATCH 4/4] feat: There is no way the, bug #52942 --- .../my-questions/components/answerItem.vue | 4 +- .../personal/pages/my-questions/index.vue | 39 +++++++++++++++---- 2 files changed, 35 insertions(+), 8 deletions(-) diff --git a/src/pages/personal/pages/my-questions/components/answerItem.vue b/src/pages/personal/pages/my-questions/components/answerItem.vue index 453bed1d8..e1366e114 100644 --- a/src/pages/personal/pages/my-questions/components/answerItem.vue +++ b/src/pages/personal/pages/my-questions/components/answerItem.vue @@ -102,15 +102,17 @@ export default { methods:{ //提交 handleSubmit(){ + this.$emit('emitInsState',false) let asdId = sessionStorage.getItem('queId') this.form.fileList = this.fileList this.form.askId = asdId this.$http.postData('lawss/Reply/insertReply',{ ...this.form },{ _this: this }, res => { - if(res.merge === '添加成功'){ + if(res.respCode === '200'){ this.form.reply = '' this.fileList = [] + this.$emit('emitInsState',true) } }, e => { diff --git a/src/pages/personal/pages/my-questions/index.vue b/src/pages/personal/pages/my-questions/index.vue index 7541be07c..965306a16 100644 --- a/src/pages/personal/pages/my-questions/index.vue +++ b/src/pages/personal/pages/my-questions/index.vue @@ -88,6 +88,7 @@
+ 正在加载数据 @@ -145,6 +146,7 @@ + 正在加载数据 @@ -202,6 +204,7 @@ + 正在加载数据 @@ -259,6 +262,7 @@ + 正在加载数据 @@ -324,13 +328,14 @@ + 正在加载数据
- +
@@ -388,9 +393,10 @@ + 正在加载数据
- +
@@ -448,9 +454,10 @@ + 正在加载数据
- +
@@ -504,13 +511,16 @@ + 正在加载数据
- +
@@ -580,6 +590,7 @@ + 正在加载数据 @@ -638,6 +649,7 @@ + 正在加载数据 @@ -694,6 +706,7 @@ + 正在加载数据 @@ -751,6 +764,7 @@ + 正在加载数据 @@ -1225,6 +1239,7 @@ export default { }, data(){ return{ + dataLoading: true, mergeList: [], historyList: [], //相似历史问题 handleSelectForm: { @@ -1322,6 +1337,14 @@ export default { } }, methods:{ + emitInsState(state){ + console.log(state) + if(state){ + this.questionClick() + }else { + this.dataLoading = true + } + }, changeInput:debounce(function(val){ if(val.length){ this.$http.get('lawss/AskQuestions/resemblance',{ @@ -1577,7 +1600,8 @@ export default { }) }, questionClick(){ - sessionStorage.setItem('queId', this.activeQue) + this.dataLoading = true + sessionStorage.setItem('queId', this.activeQue) this.$http.get('lawss/AskQuestions/getAskQuestionsByakId',{ id: this.activeQue },{ @@ -1593,6 +1617,7 @@ export default { }else{ this.answerList = res.data } + this.dataLoading = false }, e => { }) },