Merge remote-tracking branch 'origin/develop' into develop

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;

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 => {

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;

src/pages/loginVerifyPhone/index.vue

@@ -1,6 +1,10 @@
 <!-- 长城项目 登录页 -->
 <template>
-
+    <div style="width: 100%;height: 100%;overflow: auto;margin: 0;padding: 0;background: #F6F6F6;" >
+        <div class="card-box">
+            <van-loading size="24px" color="#3170A8">验证中...</van-loading>
+        </div>
+    </div>
 </template>
 
 <script>
@@ -14,6 +18,8 @@
 
     export default {
         name: 'loginVerifyPhone',
+        components: {},
+
         data () {
             return {
                 username: this.$store.state.laws_urm || '', // 用户名
@@ -58,6 +64,7 @@
             loginNew (res) {
                 let Base64 = require('js-base64').Base64
                 let userInfoStr = Base64.decode(res.data)
+                console.log(userInfoStr)
                 let userInfo2 = decodeURIComponent(userInfoStr)
                 let userInfoObj = JSON.parse(userInfo2)
                 userInfoObj.userId = userInfoObj.usid
@@ -76,21 +83,19 @@
                 // 获取用户菜单
                 window.sessionStorage.setItem('userInfo', userInfo); // del
                 this.getMenu().then((menuList) => {
-                    let hasHomeMenu = false
+                    let hasHomeMenu = true
-                    menuList.map((menuItem) => {
+                    console.log("权限检查结果："+hasHomeMenu)
-                        if (menuItem.id === 'asdfadf') {
-                            hasHomeMenu = true
-                        }
-                    })
                     window.sessionStorage.setItem('hasHomeMenu', hasHomeMenu); // del
                     window.sessionStorage.setItem('menuList', menuList); // del
                     if (hasHomeMenu) {
                         this.setMenu(JSON.stringify(menuList)).then(res => {
-                            this.$router.push('phoneHome')
+                            this.$router.push("/phoneHome")
                         }, e => {
+                            console.log("解析遍历权限列表出现异常")
                             this.logout()
                         })
                     } else {
+                        console.log("权限检查失败，没有首页权限")
                         this.logout()
                     }
                 })
@@ -102,6 +107,7 @@
         },
         mounted () {
             window.HWH5.getAuthCode().then(data => {
+                console.log("获取到了welinkCode")
                 console.log(data)
                 if(data){
                     let code = data.code
@@ -117,6 +123,7 @@
                             this.loginNew(res)
                         } else {
                             if(res.respCode && res.respCode === 'r0011'){
+                                console.log("根据welinkCode获取用户信息失败")
                                 this.logout()
                             }
                         }
@@ -139,5 +146,11 @@
 </script>
 
 <style lang="less" scoped>
-
+    .card-box{
+        height: 85%;
+        position: relative;
+        overflow-y: scroll;
+        top: 100px;
+        text-align: center;
+    }
 </style>

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 => {
 

src/pages/personal/pages/my-questions/index.vue

@@ -88,6 +88,7 @@
                                     </div>
                                   </div>
                                 </template>
+                                <loading :loading="dataLoading">正在加载数据</loading>
                               </div>
                             </el-tab-pane>
                           </template>
@@ -145,6 +146,7 @@
                                     </div>
                                   </div>
                                 </template>
+                                <loading :loading="dataLoading">正在加载数据</loading>
                               </div>
                             </el-tab-pane>
                           </template>
@@ -202,6 +204,7 @@
                                     </div>
                                   </div>
                                 </template>
+                                <loading :loading="dataLoading">正在加载数据</loading>
                               </div>
                             </el-tab-pane>
                           </template>
@@ -259,6 +262,7 @@
                                     </div>
                                   </div>
                                 </template>
+                                <loading :loading="dataLoading">正在加载数据</loading>
                               </div>
                             </el-tab-pane>
                           </template>
@@ -324,13 +328,14 @@
                                 <template v-for="(item, index) in answerList">
                                   <div class="clearfix">
                                     <div class="answer-box" >
-                                      <question-item-info :answer="item"></question-item-info>
+                                      <question-item-info :answer="item" :dataLoading="dataLoading"></question-item-info>
                                     </div>
                                   </div>
                                 </template>
+                                <loading :loading="dataLoading">正在加载数据</loading>
                               </div>
                               <div class="info-answer" >
-                                <answer-item></answer-item>
+                                <answer-item @emitInsState="emitInsState"></answer-item>
                               </div>
                             </el-tab-pane>
                           </template>
@@ -388,9 +393,10 @@
                                     </div>
                                   </div>
                                 </template>
+                                <loading :loading="dataLoading">正在加载数据</loading>
                               </div>
                               <div class="info-answer" >
-                                <answer-item></answer-item>
+                                <answer-item @emitInsState="emitInsState"></answer-item>
                               </div>
                             </el-tab-pane>
                           </template>
@@ -448,9 +454,10 @@
                                     </div>
                                   </div>
                                 </template>
+                                <loading :loading="dataLoading">正在加载数据</loading>
                               </div>
                               <div class="info-answer" >
-                                <answer-item></answer-item>
+                                <answer-item @emitInsState="emitInsState"></answer-item>
                               </div>
                             </el-tab-pane>
                           </template>
@@ -504,13 +511,16 @@
                                 <template v-for="(item, index) in answerList">
                                   <div class="clearfix">
                                     <div class="answer-box" >
-                                      <question-item-info :answer="item"></question-item-info>
+                                      <question-item-info
+                                      :answer="item"
+                                      ></question-item-info>
                                     </div>
                                   </div>
                                 </template>
+                                <loading :loading="dataLoading">正在加载数据</loading>
                               </div>
                               <div class="info-answer" >
-                                <answer-item></answer-item>
+                                <answer-item   @emitInsState="emitInsState"></answer-item>
                               </div>
                             </el-tab-pane>
                           </template>
@@ -580,6 +590,7 @@
                                     </div>
                                   </div>
                                 </template>
+                                <loading :loading="dataLoading">正在加载数据</loading>
                               </div>
                             </el-tab-pane>
                           </template>
@@ -638,6 +649,7 @@
                                   </div>
                                 </template>
                               </div>
+                              <loading :loading="dataLoading">正在加载数据</loading>
                             </el-tab-pane>
                           </template>
                         </el-tabs>
@@ -694,6 +706,7 @@
                                     </div>
                                   </div>
                                 </template>
+                                <loading :loading="dataLoading">正在加载数据</loading>
                               </div>
                             </el-tab-pane>
                           </template>
@@ -751,6 +764,7 @@
                                     </div>
                                   </div>
                                 </template>
+                                <loading :loading="dataLoading">正在加载数据</loading>
                               </div>
                             </el-tab-pane>
                           </template>
@@ -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 => {
        })
     },
@@ -1811,9 +1836,10 @@ export default {
       margin-right: 0;
     }
     /deep/.el-tabs__content {
+      overflow-y: auto;
       padding: 0;
       .el-tab-pane {
-        height: 100%;
+        height: 98%;
       }
     }
   }
@@ -1825,7 +1851,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 +1891,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;

src/pages/phone/phoneHome.vue

@@ -4,7 +4,6 @@
       <div class="top-title">
       </div>
       <h3 class="home-title">标 准 法 规 管 理 系 统 S R M S</h3>
-      <div style="border: 1px solid #FFFFFF; position:absolute; top: 15%; left: 49% ;width: 25px; "></div>
     </div>
     <div class="search-head">
       <van-search

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') {
+      if(this.rules){
-        this.rules.standName[0].required = false
+        if (val === '1') {
-        this.rules.standEnName[0].required = true;
+          this.rules.standName[0].required = false
-        this.rules.standNature[0].required = false
+          this.rules.standNature[0].required = false
-      } else {
+        } else {
-        this.rules.standName[0].required = true
+          this.rules.standName[0].required = true
-        this.rules.standNature[0].required = true
+          this.rules.standNature[0].required = true
-        this.rules.standEnName[0].required = false;
+        }
       }
       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 : ''

src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue

@@ -1557,7 +1557,6 @@
                 return data
             },
             getStandInfoByReviseStatus(type) {
-            debugger
                 let date = new Date();
                 let year = date.getFullYear();
                 if(this.form.standStatus === '2'){