diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index b8f40bf50..65c40907c 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -74,7 +74,8 @@
         <div slot="left">
           <div class="search-area">
             <div class="left">
-              <el-form :modal="standCommonlySearch" :inline="true" class="label-input-form">
+              <el-form :modal="standCommonlySearch" :inline="true" class="label-input-form"
+                       @keyup.enter.native="searchBtnClick(standCommonlySearch)">
                 <!--                <el-form-item label="标准==类别" class="search-item" style="margin-top:1px;">-->
                 <!--                  <el-select v-model="standCommonlySearch.standSort" filterable>-->
                 <!--                    <el-option-->
@@ -115,10 +116,9 @@
                     v-btn-permission="'d38fea2d0d992615f9e1c4dfb6dc76f3'"
                     @click="clearAllSearch('standCommonlySearch')">清空
                   </el-button>
-                  <el-button size="mini" type="primary" class="common-button-default"
-                             v-btn-permission="'c9cb749aacefc52347f1250d0f98272a'" @click="selectMoreBtn">
-<!--                    <i class="iconfont">&#xe7a5;</i>-->
-                    高级检索
+                  <el-button size="mini" type="primary" class="common-button-primary"
+                             v-btn-permission="'c9cb749aacefc52347f1250d0f98272a'" @click="selectMoreBtn"><i
+                    class="iconfont">&#xe7a5;</i>高级检索
                   </el-button>
                 </el-form-item>
               </el-form>
@@ -346,28 +346,29 @@
                              label="收藏" align="center" width="50px"
             >
               <template slot-scope="scope">
-<!--                <div-->
-<!--                  v-if="isPermission('cac1eb379eb8e3b987cbb2e4599adb50,247cebaefa7cf1683092af160af11502,dbaf9df2990a595c8abea28e68b1a681') == 1"-->
-<!--                  @command="handleCommand"-->
-<!--                >-->
-<!--                  <el-button type="text" v-btn-permission="'cac1eb379eb8e3b987cbb2e4599adb50'"-->
-<!--                             v-if="scope.row.collectBtn"-->
-<!--                             @click="handleCommand([scope.row, '收藏'])"-->
-<!--                  >收藏-->
-<!--                  </el-button>-->
-<!--                  <el-button type="text" v-btn-permission="'cac1eb379eb8e3b987cbb2e4599adb50'"-->
-<!--                             v-else-->
-<!--                             @click="handleCommand([scope.row, '取消收藏'])"-->
-<!--                  >取消收藏-->
-<!--                  </el-button>-->
-<!--                  <el-button type="text" @click="handleCommand([scope.row, '编辑'])"-->
-<!--                             v-btn-permission="'247cebaefa7cf1683092af160af11502'">编辑-->
-<!--                  </el-button>-->
-<!--                  <el-button type="text" @click="handleCommand([scope.row, '删除']) "-->
-<!--                             v-btn-permission="'dbaf9df2990a595c8abea28e68b1a681'">删除-->
-<!--                  </el-button>-->
-<!--                </div>-->
-                <div>
+                <div
+                  v-if="isPermission('cac1eb379eb8e3b987cbb2e4599adb50,247cebaefa7cf1683092af160af11502,dbaf9df2990a595c8abea28e68b1a681') == 1"
+                  @command="handleCommand"
+                >
+                  <el-button type="text" v-btn-permission="'cac1eb379eb8e3b987cbb2e4599adb50'"
+                             v-if="scope.row.collectBtn"
+                             @click="handleCommand([scope.row, '收藏'])"
+                  >收藏
+                  </el-button>
+                  <el-button type="text" v-btn-permission="'cac1eb379eb8e3b987cbb2e4599adb50'"
+                             v-else
+                             @click="handleCommand([scope.row, '取消收藏'])"
+                  >取消收藏
+                  </el-button>
+                  <el-button type="text" @click="handleCommand([scope.row, '编辑'])"
+                             v-btn-permission="'247cebaefa7cf1683092af160af11502'">编辑
+                  </el-button>
+                  <el-button type="text" @click="handleCommand([scope.row, '删除']) "
+                             v-btn-permission="'dbaf9df2990a595c8abea28e68b1a681'">删除
+                  </el-button>
+                </div>
+
+                <div v-else>
                   <div @click.stop style="display: inline-block">
                     <!--                                            <i class="iconfont">&#xe61e;</i>-->
                     <el-button title="收藏" class="collection-btn" icon="el-icon-star-off"
@@ -697,16 +698,16 @@
                   <template v-else-if="field.attrField === 'DYMCCAR'">
                     <el-form-item label="模块结构单元名称(乘用车)" title="模块结构单元名称(乘用车)" label-width="150px" prop="dymccar" class="add-form-item">
                       <el-input
-                        v-if="sarStandardsInfoEO.DYBXHCAR === '' || sarStandardsInfoEO.DYBXHCAR === undefined"
-                        v-model="sarStandardsInfoEO.DYMCCAR = ''"
-                        disabled
-                        clearable
+                              v-if="sarStandardsInfoEO.DYBXHCAR === '' || sarStandardsInfoEO.DYBXHCAR === undefined"
+                              v-model="sarStandardsInfoEO.DYMCCAR = ''"
+                              disabled
+                              clearable
                       ></el-input>
                       <el-input
-                        v-else
-                        v-model="sarStandardsInfoEO.DYMCCAR"
-                        disabled
-                        clearable
+                              v-else
+                              v-model="sarStandardsInfoEO.DYMCCAR"
+                              disabled
+                              clearable
                       ></el-input>
                     </el-form-item>
                   </template>
diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index e0dac212d..748348134 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -646,14 +646,14 @@
                                       </el-select>
                                     </el-form-item>-->
                   <!--            体系类别-->
-                  <!-- <el-form-item label="体系类别" class="add-form-item form-item-disabled">
-                     <el-select v-model="advanceSearchMapping.TXLB" placeholder="根据体系类别查找" clearable
-                                @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
-                       <el-option v-for="opt in txlbOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"
-                                  :label="opt.label">{{ opt.label }}
-                       </el-option>
-                     </el-select>
-                   </el-form-item>-->
+                 <!-- <el-form-item label="体系类别" class="add-form-item form-item-disabled">
+                    <el-select v-model="advanceSearchMapping.TXLB" placeholder="根据体系类别查找" clearable
+                               @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                      <el-option v-for="opt in txlbOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"
+                                 :label="opt.label">{{ opt.label }}
+                      </el-option>
+                    </el-select>
+                  </el-form-item>-->
                   <!--            责任工程师-->
                   <template>
                     <el-form-item
@@ -1080,9 +1080,9 @@
                   </template>
                   <template v-else-if="field.attrField === 'DYBXH'">
                     <el-form-item
-                      prop="DYBXH"
-                      label-width="150px"
-                      class="add-form-item"
+                            prop="DYBXH"
+                            label-width="150px"
+                            class="add-form-item"
                     >
                       <template slot="label">模块结构单元变型号(卡车)</template>
                       <el-input v-model="sarStandardsInfoEO.DYBXH" placeholder="选择模块结构单元变型号(卡车)"
@@ -1101,9 +1101,9 @@
                   </template>
                   <template v-else-if="field.attrField === 'DYBXHCAR'">
                     <el-form-item
-                      prop="DYBXHCAR"
-                      label-width="150px"
-                      class="add-form-item"
+                            prop="DYBXHCAR"
+                            label-width="150px"
+                            class="add-form-item"
                     >
                       <template slot="label">模块结构单元变型号(乘用车)</template>
                       <el-input v-model="sarStandardsInfoEO.DYBXHCAR" placeholder="选择模块结构单元变型号(乘用车)"
@@ -1114,16 +1114,16 @@
                   <template v-else-if="field.attrField === 'DYMCCAR'">
                     <el-form-item label="模块结构单元名称(乘用车)" label-width="150px" prop="DYMCCAR" class="add-form-item">
                       <el-input
-                        v-if="sarStandardsInfoEO.DYBXHCAR === '' || sarStandardsInfoEO.DYBXHCAR === undefined"
-                        v-model="sarStandardsInfoEO.DYMCCAR = ''"
-                        disabled
-                        clearable
+                              v-if="sarStandardsInfoEO.DYBXHCAR === '' || sarStandardsInfoEO.DYBXHCAR === undefined"
+                              v-model="sarStandardsInfoEO.DYMCCAR = ''"
+                              disabled
+                              clearable
                       ></el-input>
                       <el-input
-                        v-else
-                        v-model="sarStandardsInfoEO.DYMCCAR"
-                        disabled
-                        clearable
+                              v-else
+                              v-model="sarStandardsInfoEO.DYMCCAR"
+                              disabled
+                              clearable
                       ></el-input>
                     </el-form-item>
                   </template>
@@ -1686,18 +1686,18 @@
         @popoverHideCancel="popoverHideModelCancel()">
       </tree-select-module>
       <tree-select-module
-        width="500"
-        :lazy=true
-        :multiple=true
-        :check-strictly=true
-        :modalShowFlag="modalShowFlag5"
-        :drawerTitle="drawerTitle"
-        :url="url"
-        :type="modelType"
-        :urlChild="urlChild"
-        :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys4"
-        :nodeKey="nodeKeyModel" @popoverHide="popoverCarHideModel"
-        @popoverHideCancel="popoverCarHideModelCancel()">
+              width="500"
+              :lazy=true
+              :multiple=true
+              :check-strictly=true
+              :modalShowFlag="modalShowFlag5"
+              :drawerTitle="drawerTitle"
+              :url="url"
+              :type="modelType"
+              :urlChild="urlChild"
+              :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys4"
+              :nodeKey="nodeKeyModel" @popoverHide="popoverCarHideModel"
+              @popoverHideCancel="popoverCarHideModelCancel()">
       </tree-select-module>
       <!-- 导入失败 -->
       <el-dialog :visible.sync="importFailed" :close-on-click-modal="false" width="400px">
diff --git a/src/pages/regulatoryRepository/standQA/index.vue b/src/pages/regulatoryRepository/standQA/index.vue
index 354b897b5..6f3216768 100644
--- a/src/pages/regulatoryRepository/standQA/index.vue
+++ b/src/pages/regulatoryRepository/standQA/index.vue
@@ -408,11 +408,11 @@
               <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" class="table-jump" style="color: #F56C6C"
                  @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
                   scope.row.standNumber
-                }}-{{ scope.row.standYear }}</a>
+                }}{{ scope.row.standYear ?  '-' + scope.row.standYear : '' }}</a>
               <a v-else-if="scope.row.standYear" class="table-jump" style="color: #333333"
                  @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
                   scope.row.standNumber
-                }}-{{ scope.row.standYear }}</a>
+                }}{{ scope.row.standYear ?  '-' + scope.row.standYear : '' }}</a>
               <a v-else @click="handlePreview(scope.row)" class="table-jump" style="color: #333333">
                 {{ scope.row.standSortShow }}
                 {{ scope.row.standNumber }}</a>
@@ -486,19 +486,14 @@
             width="150"
           >
             <template slot-scope="scope">
-              <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C" class="table-jump" @click="handlePreview(scope.row)">{{
-                  scope.row.standSortShow
-                }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
-              <a v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF" class="table-jump" @click="handlePreview(scope.row)">{{
-                  scope.row.standSortShow
-                }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
-              <a v-else-if="scope.row.standYear" style="color: #333333" class="table-jump" @click="handlePreview(scope.row)">{{
-                  scope.row.standSortShow
-                }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
-              <a v-else style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{
-                  scope.row.standSortShow
-                }}
-                {{ scope.row.standNumber }}</a>
+              <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C" class="table-jump" @click="handlePreview(scope.row)">
+                {{scope.row.standSortShow}} {{ scope.row.standNumber }}{{ scope.row.standYear ?  '-' + scope.row.standYear : '' }}</a>
+              <a v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF" class="table-jump" @click="handlePreview(scope.row)">
+                {{ scope.row.standSortShow }} {{ scope.row.standNumber }}{{ scope.row.standYear ?  '-' + scope.row.standYear : '' }}</a>
+              <a v-else-if="scope.row.standYear" style="color: #333333" class="table-jump" @click="handlePreview(scope.row)">
+                {{ scope.row.standSortShow }} {{ scope.row.standNumber }}{{ scope.row.standYear ?  '-' + scope.row.standYear : '' }}</a>
+              <a v-else style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">
+                {{ scope.row.standSortShow }} {{ scope.row.standNumber }}</a>
             </template>
           </el-table-column>
           <el-table-column
@@ -1087,6 +1082,7 @@ export default {
        this.$http.get('lawss/AskQuestions/getAskQuestionsNew',{
          standardId: this.activestand,
          classification: this.activeName,
+         problemDescription: this.questionSerach.problemDescription
        },{
          _this: this
        }, res => {
diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js
index 5e1b96607..a6096515a 100644
--- a/src/sysConfig/index.js
+++ b/src/sysConfig/index.js
@@ -6,10 +6,10 @@
 // 服务器地址
 // const devIp = '39.98.140.126'
 // const devInterfacePORT = '10005'
-// const devIp = '192.168.1.33'
+// const devIp = '192.168.1.42'
 // const devInterfacePORT = '9999'
-const devIp = '192.168.0.109'
-const devInterfacePORT = '9999'
+const devIp = '39.98.140.126'
+const devInterfacePORT = '4201'
 // const devIp = '62.234.136.153'
 // const devInterfacePORT = '8033'
 // 配置 idm 认证