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

src/main.js

@@ -168,6 +168,8 @@ router.beforeEach(function (to, from, next) {
       if ((token === null || token === '' ) && toName !== 'Login') {
         if(toName !== 'phoneIndex'){
           if(toName === 'phoneHome'){
+            // 手机端 首页 首次进入系统 清除 缓存, 防止 跳转 oa 的页面, 问题追溯 #55852
+            window.sessionStorage.clear()
             next('/loginVerifyPhone')
           }else {
             if(fromName === 'phoneHome'){

src/pages/personal/pages/my-questions/components/questionItemInfo.vue

@@ -24,7 +24,7 @@
         </div>
       </div>
       <div style="float: right; margin-top: 20px">
-        <el-checkbox v-if="answer.checkedShow" @change="answerChang" :disabled="answer.state && answer.state === 'yes'"  v-model="answer.checked">归档</el-checkbox>
+        <el-checkbox v-if="answer.checkedShow && (answer.answerer !== answererNowUserName)" @change="answerChang" :disabled="answer.state && answer.state === 'yes'"  v-model="answer.checked">归档</el-checkbox>
       </div>
     </div>
 <!--    <div class="footer-box">-->
@@ -40,6 +40,8 @@ export default {
   data(){
     return{
       checked: '',
+      answererNowUserId: this.$store.getters.userInfo.userId,
+      answererNowUserName: this.$store.getters.userInfo.userName,
     }
   },
   methods:{

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

@@ -872,7 +872,6 @@
         <el-form-item label="标准号/标准名称" class="search-item">
           <el-input
             v-model="handleSelectForm.lawNumber"
-            @change="lawNumberSearch"
             placeholder="根据标准号/标准名称查找"
             clearable
             :maxlength="100"></el-input>
@@ -1454,6 +1453,7 @@ export default {
     },
     //选择标准的查询按钮
     searchLawBtn(){
+      this.lawNumberSearch()
       this.lawInfoTableLoading = true
       if (this.handleSelectForm.dataSource === 'INLAND'){
         this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPageByWk1',this.handleSelectForm,{

src/pages/regulatoryRepository/standQA/index.vue

@@ -1084,8 +1084,9 @@ export default {
     },
     //问题查询
     queSearch(){
-       this.$http.get('lawss/AskQuestions/getAskQuestionsByStandardId',{
+       this.$http.get('lawss/AskQuestions/getAskQuestionsNew',{
          standardId: this.activestand,
+         classification: this.activeName,
        },{
          _this: this
        }, res => {

src/sysConfig/index.js

@@ -8,8 +8,8 @@
 // const devInterfacePORT = '10005'
 // const devIp = '192.168.1.33'
 // const devInterfacePORT = '9999'
-const devIp = '39.98.140.126'
-const devInterfacePORT = '4201'
+const devIp = '192.168.0.109'
+const devInterfacePORT = '9999'
 // const devIp = '62.234.136.153'
 // const devInterfacePORT = '8033'
 // 配置 idm 认证